Remove unsupported playbooks and utilities

69 files changed, 3 insertions, 2847 deletions

diff --git a/playbooks/README.md b/playbooks/README.md
index 5857a9f59..290d4c082 100644
--- a/playbooks/README.md
+++ b/playbooks/README.md
@@ -12,8 +12,6 @@ And:
 
 - [`adhoc`](adhoc) is a generic home for playbooks and tasks that are community
   supported and not officially maintained.
-- [`aws`](aws), [`gce`](gce), [`libvirt`](libvirt) and [`openstack`](openstack)
-  are related to the [`bin/cluster`](../bin) tool and its usage is deprecated.
 
 Refer to the `README.md` file in each playbook directory for more information
 about them.
diff --git a/playbooks/aws/README.md b/playbooks/aws/README.md
index 410d98a9c..c1793c505 100644
--- a/playbooks/aws/README.md
+++ b/playbooks/aws/README.md
@@ -1,9 +1,5 @@
 # AWS playbooks
 
-Parts of this playbook directory are meant to be driven by [`bin/cluster`](../../bin),
-which is community supported and use is considered **deprecated**.
-
-
 ## Provisioning
 
 With recent desire for provisioning from customers and developers alike, the AWS
diff --git a/playbooks/aws/openshift-cluster/add_nodes.yml b/playbooks/aws/openshift-cluster/add_nodes.yml
deleted file mode 100644
index 0e8eb90c1..000000000
--- a/playbooks/aws/openshift-cluster/add_nodes.yml
+++ /dev/null
@@ -1,35 +0,0 @@
----
-- name: Launch instance(s)
-  hosts: localhost
-  connection: local
-  become: no
-  gather_facts: no
-  vars_files:
-  - vars.yml
-  vars:
-    oo_extend_env: True
-  tasks:
-  - include: ../../common/openshift-cluster/tasks/set_node_launch_facts.yml
-    vars:
-      type: "compute"
-      count: "{{ num_nodes }}"
-  - include: tasks/launch_instances.yml
-    vars:
-      instances: "{{ node_names }}"
-      cluster: "{{ cluster_id }}"
-      type: "{{ k8s_type }}"
-      g_sub_host_type: "{{ sub_host_type }}"
-
-  - include: ../../common/openshift-cluster/tasks/set_node_launch_facts.yml
-    vars:
-      type: "infra"
-      count: "{{ num_infra }}"
-  - include: tasks/launch_instances.yml
-    vars:
-      instances: "{{ node_names }}"
-      cluster: "{{ cluster_id }}"
-      type: "{{ k8s_type }}"
-      g_sub_host_type: "{{ sub_host_type }}"
-
-- include: scaleup.yml
-- include: list.yml
diff --git a/playbooks/aws/openshift-cluster/cluster_hosts.yml b/playbooks/aws/openshift-cluster/cluster_hosts.yml
deleted file mode 100644
index c2f4dfedc..000000000
--- a/playbooks/aws/openshift-cluster/cluster_hosts.yml
+++ /dev/null
@@ -1,25 +0,0 @@
----
-g_all_hosts: "{{ groups['tag_clusterid_' ~ cluster_id] | default([])
-                 | intersect(groups['tag_environment_' ~ cluster_env] | default([])) }}"
-
-g_etcd_hosts: "{{ g_all_hosts | intersect(groups['tag_host-type_etcd'] | default([])) }}"
-
-g_new_etcd_hosts: "{{ g_all_hosts | intersect(groups['tag_host-type_new_etcd'] | default([])) }}"
-
-g_lb_hosts: "{{ g_all_hosts | intersect(groups['tag_host-type_lb'] | default([])) }}"
-
-g_nfs_hosts: "{{ g_all_hosts | intersect(groups['tag_host-type_nfs'] | default([])) }}"
-
-g_glusterfs_hosts: "{{ g_all_hosts | intersect(groups['tag_host-type-glusterfs'] | default([])) }}"
-
-g_master_hosts: "{{ g_all_hosts | intersect(groups['tag_host-type_master'] | default([])) }}"
-
-g_new_master_hosts: "{{ g_all_hosts | intersect(groups['tag_host-type_new_master'] | default([])) }}"
-
-g_node_hosts: "{{ g_all_hosts | intersect(groups['tag_host-type_node'] | default([])) }}"
-
-g_new_node_hosts: "{{ g_all_hosts | intersect(groups['tag_host-type_new_node'] | default([])) }}"
-
-g_infra_hosts: "{{ g_node_hosts | intersect(groups['tag_sub-host-type_infra'] | default([])) }}"
-
-g_compute_hosts: "{{ g_node_hosts | intersect(groups['tag_sub-host-type_compute'] | default([])) }}"
diff --git a/playbooks/aws/openshift-cluster/config.yml b/playbooks/aws/openshift-cluster/config.yml
deleted file mode 100644
index 821a0f30e..000000000
--- a/playbooks/aws/openshift-cluster/config.yml
+++ /dev/null
@@ -1,37 +0,0 @@
----
-- hosts: localhost
-  gather_facts: no
-  tasks:
-  - include_vars: vars.yml
-  - include_vars: cluster_hosts.yml
-  - add_host:
-      name: "{{ item }}"
-      groups: l_oo_all_hosts
-    with_items: "{{ g_all_hosts | default([]) }}"
-
-- hosts: l_oo_all_hosts
-  gather_facts: no
-  tasks:
-  - include_vars: vars.yml
-  - include_vars: cluster_hosts.yml
-
-- include: ../../common/openshift-cluster/config.yml
-  vars:
-    g_ssh_user: "{{ deployment_vars[deployment_type].ssh_user }}"
-    g_sudo: "{{ deployment_vars[deployment_type].become }}"
-    g_nodeonmaster: true
-    openshift_cluster_id: "{{ cluster_id }}"
-    openshift_debug_level: "{{ debug_level }}"
-    openshift_deployment_type: "{{ deployment_type }}"
-    openshift_public_hostname: "{{ ec2_ip_address }}"
-    openshift_hosted_registry_selector: 'type=infra'
-    openshift_hosted_router_selector: 'type=infra'
-    openshift_node_labels:
-      region: "{{ deployment_vars[deployment_type].region }}"
-      type: "{{ hostvars[inventory_hostname]['ec2_tag_sub-host-type'] }}"
-    openshift_master_cluster_method: 'native'
-    openshift_use_openshift_sdn: "{{ lookup('oo_option', 'use_openshift_sdn') }}"
-    os_sdn_network_plugin_name: "{{ lookup('oo_option', 'sdn_network_plugin_name') }}"
-    openshift_use_flannel: "{{ lookup('oo_option', 'use_flannel') }}"
-    openshift_use_calico: "{{ lookup('oo_option', 'use_calico') }}"
-    openshift_use_fluentd: "{{ lookup('oo_option', 'use_fluentd') }}"
diff --git a/playbooks/aws/openshift-cluster/launch.yml b/playbooks/aws/openshift-cluster/launch.yml
deleted file mode 100644
index 3edace493..000000000
--- a/playbooks/aws/openshift-cluster/launch.yml
+++ /dev/null
@@ -1,54 +0,0 @@
----
-- name: Launch instance(s)
-  hosts: localhost
-  connection: local
-  become: no
-  gather_facts: no
-  vars_files:
-  - vars.yml
-  tasks:
-  - include: ../../common/openshift-cluster/tasks/set_etcd_launch_facts.yml
-  - include: tasks/launch_instances.yml
-    vars:
-      instances: "{{ etcd_names }}"
-      cluster: "{{ cluster_id }}"
-      type: "{{ k8s_type }}"
-      g_sub_host_type: "default"
-
-  - include: ../../common/openshift-cluster/tasks/set_master_launch_facts.yml
-  - include: tasks/launch_instances.yml
-    vars:
-      instances: "{{ master_names }}"
-      cluster: "{{ cluster_id }}"
-      type: "{{ k8s_type }}"
-      g_sub_host_type: "default"
-
-  - include: ../../common/openshift-cluster/tasks/set_node_launch_facts.yml
-    vars:
-      type: "compute"
-      count: "{{ num_nodes }}"
-  - include: tasks/launch_instances.yml
-    vars:
-      instances: "{{ node_names }}"
-      cluster: "{{ cluster_id }}"
-      type: "{{ k8s_type }}"
-      g_sub_host_type: "{{ sub_host_type }}"
-
-  - include: ../../common/openshift-cluster/tasks/set_node_launch_facts.yml
-    vars:
-      type: "infra"
-      count: "{{ num_infra }}"
-  - include: tasks/launch_instances.yml
-    vars:
-      instances: "{{ node_names }}"
-      cluster: "{{ cluster_id }}"
-      type: "{{ k8s_type }}"
-      g_sub_host_type: "{{ sub_host_type }}"
-
-  - add_host:
-      name: "{{ master_names.0 }}"
-      groups: service_master
-    when: master_names is defined and master_names.0 is defined
-
-- include: update.yml
-- include: list.yml
diff --git a/playbooks/aws/openshift-cluster/list.yml b/playbooks/aws/openshift-cluster/list.yml
deleted file mode 100644
index ed8aac398..000000000
--- a/playbooks/aws/openshift-cluster/list.yml
+++ /dev/null
@@ -1,23 +0,0 @@
----
-- name: Generate oo_list_hosts group
-  hosts: localhost
-  gather_facts: no
-  connection: local
-  become: no
-  vars_files:
-  - vars.yml
-  tasks:
-  - set_fact: scratch_group=tag_clusterid_{{ cluster_id }}
-    when: cluster_id != ''
-  - set_fact: scratch_group=all
-    when: cluster_id == ''
-  - add_host:
-      name: "{{ item }}"
-      groups: oo_list_hosts
-      ansible_ssh_user: "{{ deployment_vars[deployment_type].ssh_user }}"
-      ansible_become: "{{ deployment_vars[deployment_type].become }}"
-      oo_public_ipv4: "{{ hostvars[item].ec2_ip_address }}"
-      oo_private_ipv4: "{{ hostvars[item].ec2_private_ip_address }}"
-    with_items: "{{ groups[scratch_group] | default([]) | difference(['localhost']) }}"
-  - debug:
-      msg: "{{ hostvars | oo_select_keys(groups[scratch_group] | default([])) | oo_pretty_print_cluster }}"
diff --git a/playbooks/aws/openshift-cluster/scaleup.yml b/playbooks/aws/openshift-cluster/scaleup.yml
deleted file mode 100644
index 6fa9142a0..000000000
--- a/playbooks/aws/openshift-cluster/scaleup.yml
+++ /dev/null
@@ -1,32 +0,0 @@
----
-
-- hosts: localhost
-  gather_facts: no
-  connection: local
-  become: no
-  vars_files:
-  - vars.yml
-  tasks:
-  - name: Evaluate oo_hosts_to_update
-    add_host:
-      name: "{{ item }}"
-      groups: oo_hosts_to_update
-      ansible_ssh_user: "{{ deployment_vars[deployment_type].ssh_user }}"
-      ansible_become: "{{ deployment_vars[deployment_type].become }}"
-    with_items: "{{ groups.nodes_to_add }}"
-
-- include: ../../common/openshift-cluster/update_repos_and_packages.yml
-
-- include: ../../common/openshift-cluster/scaleup.yml
-  vars_files:
-  - ../../aws/openshift-cluster/vars.yml
-  - ../../aws/openshift-cluster/cluster_hosts.yml
-  vars:
-    g_new_node_hosts: "{{ groups.nodes_to_add }}"
-    g_ssh_user: "{{ deployment_vars[deployment_type].ssh_user }}"
-    g_sudo: "{{ deployment_vars[deployment_type].become }}"
-    g_nodeonmaster: true
-    openshift_cluster_id: "{{ cluster_id }}"
-    openshift_debug_level: "{{ debug_level }}"
-    openshift_deployment_type: "{{ deployment_type }}"
-    openshift_public_hostname: "{{ ec2_ip_address }}"
diff --git a/playbooks/aws/openshift-cluster/service.yml b/playbooks/aws/openshift-cluster/service.yml
deleted file mode 100644
index f7f4812bb..000000000
--- a/playbooks/aws/openshift-cluster/service.yml
+++ /dev/null
@@ -1,31 +0,0 @@
----
-- name: Call same systemctl command for openshift on all instance(s)
-  hosts: localhost
-  connection: local
-  become: no
-  gather_facts: no
-  vars_files:
-  - vars.yml
-  - cluster_hosts.yml
-  tasks:
-  - fail: msg="cluster_id is required to be injected in this playbook"
-    when: cluster_id is not defined
-
-  - name: Evaluate g_service_masters
-    add_host:
-      name: "{{ item }}"
-      groups: g_service_masters
-      ansible_ssh_user: "{{ deployment_vars[deployment_type].ssh_user }}"
-      ansible_become: "{{ deployment_vars[deployment_type].become }}"
-    with_items: "{{ master_hosts | default([]) }}"
-
-  - name: Evaluate g_service_nodes
-    add_host:
-      name: "{{ item }}"
-      groups: g_service_nodes
-      ansible_ssh_user: "{{ deployment_vars[deployment_type].ssh_user }}"
-      ansible_become: "{{ deployment_vars[deployment_type].become }}"
-    with_items: "{{ node_hosts | default([]) }}"
-
-- include: ../../common/openshift-node/service.yml
-- include: ../../common/openshift-master/service.yml
diff --git a/playbooks/aws/openshift-cluster/tasks/launch_instances.yml b/playbooks/aws/openshift-cluster/tasks/launch_instances.yml
deleted file mode 100644
index 608512b79..000000000
--- a/playbooks/aws/openshift-cluster/tasks/launch_instances.yml
+++ /dev/null
@@ -1,188 +0,0 @@
----
-- set_fact:
-    created_by: "{{ lookup('env', 'LOGNAME')|default(cluster, true) }}"
-    docker_vol_ephemeral: "{{ lookup('env', 'os_docker_vol_ephemeral') | default(false, true) }}"
-    cluster: "{{ cluster_id }}"
-    env: "{{ cluster_env }}"
-    host_type: "{{ type }}"
-    sub_host_type: "{{ g_sub_host_type }}"
-
-- set_fact:
-    ec2_instance_type: "{{ lookup('env', 'ec2_master_instance_type') | default(deployment_vars[deployment_type].type, true) }}"
-    ec2_security_groups: "{{ lookup('env', 'ec2_master_security_groups') | default(deployment_vars[deployment_type].security_groups, true) }}"
-  when: host_type == "master" and sub_host_type == "default"
-
-- set_fact:
-    ec2_instance_type: "{{ lookup('env', 'ec2_etcd_instance_type') | default(deployment_vars[deployment_type].type, true) }}"
-    ec2_security_groups: "{{ lookup('env', 'ec2_etcd_security_groups') | default(deployment_vars[deployment_type].security_groups, true) }}"
-  when: host_type == "etcd" and sub_host_type == "default"
-
-- set_fact:
-    ec2_instance_type: "{{ lookup('env', 'ec2_infra_instance_type') | default(deployment_vars[deployment_type].type, true) }}"
-    ec2_security_groups: "{{ lookup('env', 'ec2_infra_security_groups') | default(deployment_vars[deployment_type].security_groups, true) }}"
-  when: host_type == "node" and sub_host_type == "infra"
-
-- set_fact:
-    ec2_instance_type: "{{ lookup('env', 'ec2_node_instance_type') | default(deployment_vars[deployment_type].type, true) }}"
-    ec2_security_groups: "{{ lookup('env', 'ec2_node_security_groups') | default(deployment_vars[deployment_type].security_groups, true) }}"
-  when: host_type == "node" and sub_host_type == "compute"
-
-- set_fact:
-    ec2_instance_type: "{{ deployment_vars[deployment_type].type }}"
-  when: ec2_instance_type is not defined
-- set_fact:
-    ec2_security_groups: "{{ deployment_vars[deployment_type].security_groups }}"
-  when: ec2_security_groups is not defined
-
-- name: Find amis for deployment_type
-  ec2_ami_find:
-    region: "{{ deployment_vars[deployment_type].region }}"
-    ami_id: "{{ deployment_vars[deployment_type].image }}"
-    name: "{{ deployment_vars[deployment_type].image_name }}"
-  register: ami_result
-
-- fail: msg="Could not find requested ami"
-  when: not ami_result.results
-
-- set_fact:
-    latest_ami: "{{ ami_result.results | oo_ami_selector(deployment_vars[deployment_type].image_name) }}"
-    volume_defs:
-      etcd:
-        root:
-          volume_size: "{{ lookup('env', 'os_etcd_root_vol_size') | default(25, true) }}"
-          device_type: "{{ lookup('env', 'os_etcd_root_vol_type') | default('gp2', true) }}"
-          iops: "{{ lookup('env', 'os_etcd_root_vol_iops') | default(500, true) }}"
-      master:
-        root:
-          volume_size: "{{ lookup('env', 'os_master_root_vol_size') | default(25, true) }}"
-          device_type: "{{ lookup('env', 'os_master_root_vol_type') | default('gp2', true) }}"
-          iops: "{{ lookup('env', 'os_master_root_vol_iops') | default(500, true) }}"
-        docker:
-          volume_size: "{{ lookup('env', 'os_docker_vol_size') | default(10, true) }}"
-          device_type: "{{ lookup('env', 'os_docker_vol_type') | default('gp2', true) }}"
-          iops: "{{ lookup('env', 'os_docker_vol_iops') | default(500, true) }}"
-      node:
-        root:
-          volume_size: "{{ lookup('env', 'os_node_root_vol_size') | default(85, true) }}"
-          device_type: "{{ lookup('env', 'os_node_root_vol_type') | default('gp2', true) }}"
-          iops: "{{ lookup('env', 'os_node_root_vol_iops') | default(500, true) }}"
-        docker:
-          volume_size: "{{ lookup('env', 'os_docker_vol_size') | default(32, true) }}"
-          device_type: "{{ lookup('env', 'os_docker_vol_type') | default('gp2', true) }}"
-          iops: "{{ lookup('env', 'os_docker_vol_iops') | default(500, true) }}"
-
-- set_fact:
-    volumes: "{{ volume_defs | oo_ec2_volume_definition(host_type, docker_vol_ephemeral | bool) }}"
-
-- name: Launch instance(s)
-  ec2:
-    state: present
-    region: "{{ deployment_vars[deployment_type].region }}"
-    keypair: "{{ deployment_vars[deployment_type].keypair }}"
-    group: "{{ deployment_vars[deployment_type].security_groups }}"
-    instance_type: "{{ ec2_instance_type }}"
-    image: "{{ deployment_vars[deployment_type].image }}"
-    count: "{{ instances | length }}"
-    vpc_subnet_id: "{{ deployment_vars[deployment_type].vpc_subnet }}"
-    assign_public_ip: "{{ deployment_vars[deployment_type].assign_public_ip }}"
-    user_data: "{{ lookup('template', '../templates/user_data.j2') }}"
-    wait: yes
-    instance_tags:
-      created-by: "{{ created_by }}"
-      clusterid: "{{ cluster }}"
-      environment: "{{ cluster_env }}"
-      host-type: "{{ host_type }}"
-      sub-host-type: "{{ sub_host_type }}"
-    volumes: "{{ volumes }}"
-  register: ec2
-
-- name: Add Name tag to instances
-  ec2_tag: resource={{ item.1.id }} region={{ deployment_vars[deployment_type].region }} state=present
-  with_together:
-  - "{{ instances }}"
-  - "{{ ec2.instances }}"
-  args:
-    tags:
-      Name: "{{ item.0 }}"
-
-- set_fact:
-    instance_groups: >
-      tag_created-by_{{ created_by }}, tag_clusterid_{{ cluster }},
-      tag_environment_{{ cluster_env }}, tag_host-type_{{ host_type }},
-      tag_sub-host-type_{{ sub_host_type }}
-
-- set_fact:
-    node_label:
-      region: "{{ deployment_vars[deployment_type].region }}"
-      type: "{{sub_host_type}}"
-  when: host_type == "node"
-
-- set_fact:
-    node_label:
-      region: "{{ deployment_vars[deployment_type].region }}"
-      type: "{{host_type}}"
-  when: host_type != "node"
-
-- set_fact:
-    logrotate:
-    - name: syslog
-      path: |
-        /var/log/cron
-        /var/log/maillog
-        /var/log/messages
-        /var/log/secure
-        /var/log/spooler"
-      options:
-      - daily
-      - rotate 7
-      - compress
-      - sharedscripts
-      - missingok
-      scripts:
-        postrotate: "/bin/kill -HUP `cat /var/run/syslogd.pid 2> /dev/null` 2> /dev/null || true"
-
-- name: Add new instances groups and variables
-  add_host:
-    hostname: "{{ item.0 }}"
-    ansible_ssh_host: "{{ item.1.dns_name }}"
-    ansible_ssh_user: "{{ deployment_vars[deployment_type].ssh_user }}"
-    ansible_become: "{{ deployment_vars[deployment_type].become }}"
-    groups: "{{ instance_groups }}"
-    ec2_private_ip_address: "{{ item.1.private_ip }}"
-    ec2_ip_address: "{{ item.1.public_ip }}"
-    ec2_tag_sub-host-type: "{{ sub_host_type }}"
-    openshift_node_labels: "{{ node_label }}"
-    logrotate_scripts: "{{ logrotate }}"
-  with_together:
-  - "{{ instances }}"
-  - "{{ ec2.instances }}"
-
-- name: Add new instances to nodes_to_add group if needed
-  add_host:
-    hostname: "{{ item.0 }}"
-    ansible_ssh_host: "{{ item.1.dns_name }}"
-    ansible_ssh_user: "{{ deployment_vars[deployment_type].ssh_user }}"
-    ansible_become: "{{ deployment_vars[deployment_type].become }}"
-    groups: nodes_to_add
-    ec2_private_ip_address: "{{ item.1.private_ip }}"
-    ec2_ip_address: "{{ item.1.public_ip }}"
-    openshift_node_labels: "{{ node_label }}"
-    logrotate_scripts: "{{ logrotate }}"
-  with_together:
-  - "{{ instances }}"
-  - "{{ ec2.instances }}"
-  when: oo_extend_env is defined and oo_extend_env | bool
-
-- name: Wait for ssh
-  wait_for: "port=22 host={{ item.dns_name }}"
-  with_items: "{{ ec2.instances }}"
-
-- name: Wait for user setup
-  command: "ssh -o StrictHostKeyChecking=no -o PasswordAuthentication=no -o ConnectTimeout=10 -o UserKnownHostsFile=/dev/null {{ hostvars[item.0].ansible_ssh_user }}@{{ item.1.dns_name }} echo {{ hostvars[item.0].ansible_ssh_user }} user is setup"
-  register: result
-  until: result.rc == 0
-  retries: 20
-  delay: 10
-  with_together:
-  - "{{ instances }}"
-  - "{{ ec2.instances }}"
diff --git a/playbooks/aws/openshift-cluster/templates/user_data.j2 b/playbooks/aws/openshift-cluster/templates/user_data.j2
deleted file mode 100644
index b1087f9c4..000000000
--- a/playbooks/aws/openshift-cluster/templates/user_data.j2
+++ /dev/null
@@ -1,22 +0,0 @@
-#cloud-config
-{% if type in ['node', 'master'] and 'docker' in volume_defs[type] %}
-mounts:
-- [ xvdb ]
-- [ ephemeral0 ]
-{% endif %}
-
-write_files:
-{% if type in ['node', 'master'] and 'docker' in volume_defs[type] %}
-- content: |
-    DEVS=/dev/xvdb
-    VG=docker_vg
-  path: /etc/sysconfig/docker-storage-setup
-  owner: root:root
-  permissions: '0644'
-{% endif %}
-{% if deployment_vars[deployment_type].become | bool %}
-- path: /etc/sudoers.d/99-{{ deployment_vars[deployment_type].ssh_user }}-cloud-init-requiretty
-  permissions: 440
-  content: |
-    Defaults:{{ deployment_vars[deployment_type].ssh_user }} !requiretty
-{% endif %}
diff --git a/playbooks/aws/openshift-cluster/terminate.yml b/playbooks/aws/openshift-cluster/terminate.yml
deleted file mode 100644
index 1f15aa4bf..000000000
--- a/playbooks/aws/openshift-cluster/terminate.yml
+++ /dev/null
@@ -1,77 +0,0 @@
----
-- name: Terminate instance(s)
-  hosts: localhost
-  connection: local
-  become: no
-  gather_facts: no
-  vars_files:
-  - vars.yml
-  tasks:
-  - add_host:
-      name: "{{ item }}"
-      groups: oo_hosts_to_terminate
-      ansible_ssh_user: "{{ deployment_vars[deployment_type].ssh_user }}"
-      ansible_become: "{{ deployment_vars[deployment_type].become }}"
-    with_items: "{{ (groups['tag_clusterid_' ~ cluster_id] | default([])) | difference(['localhost']) }}"
-
-- name: Unsubscribe VMs
-  hosts: oo_hosts_to_terminate
-  roles:
-  - role: rhel_unsubscribe
-    when: deployment_type in ['atomic-enterprise', 'enterprise', 'openshift-enterprise'] and
-          ansible_distribution == "RedHat" and
-          lookup('oo_option', 'rhel_skip_subscription') | default(rhsub_skip, True) |
-            default('no', True) | lower in ['no', 'false']
-
-- name: Terminate instances
-  hosts: localhost
-  connection: local
-  become: no
-  gather_facts: no
-  tasks:
-  - name: Remove tags from instances
-    ec2_tag:
-      resource: "{{ hostvars[item]['ec2_id'] }}"
-      region: "{{ hostvars[item]['ec2_region'] }}"
-      state: absent
-      tags:
-        environment: "{{ hostvars[item]['ec2_tag_environment'] }}"
-        clusterid: "{{ hostvars[item]['ec2_tag_clusterid'] }}"
-        host-type: "{{ hostvars[item]['ec2_tag_host-type'] }}"
-        sub_host_type: "{{ hostvars[item]['ec2_tag_sub-host-type'] }}"
-    with_items: "{{ groups.oo_hosts_to_terminate }}"
-    when: "'oo_hosts_to_terminate' in groups"
-
-  - name: Terminate instances
-    ec2:
-      state: absent
-      instance_ids: ["{{ hostvars[item].ec2_id }}"]
-      region: "{{ hostvars[item].ec2_region }}"
-    ignore_errors: yes
-    register: ec2_term
-    with_items: "{{ groups.oo_hosts_to_terminate }}"
-    when: "'oo_hosts_to_terminate' in groups"
-
-  # Fail if any of the instances failed to terminate with an error other
-  # than 403 Forbidden
-  - fail:
-      msg: "Terminating instance {{ item.ec2_id }} failed with message {{ item.msg }}"
-    when: "'oo_hosts_to_terminate' in groups and item.has_key('failed') and item.failed"
-    with_items: "{{ ec2_term.results }}"
-
-  - name: Stop instance if termination failed
-    ec2:
-      state: stopped
-      instance_ids: ["{{ item.item.ec2_id }}"]
-      region: "{{ item.item.ec2_region }}"
-    register: ec2_stop
-    when: "'oo_hosts_to_terminate' in groups and item.has_key('failed') and item.failed"
-    with_items: "{{ ec2_term.results }}"
-
-  - name: Rename stopped instances
-    ec2_tag: resource={{ item.item.item.ec2_id }} region={{ item.item.item.ec2_region }} state=present
-    args:
-      tags:
-        Name: "{{ item.item.item.ec2_tag_Name }}-terminate"
-    with_items: "{{ ec2_stop.results }}"
-    when: ec2_stop | changed
diff --git a/playbooks/aws/openshift-cluster/update.yml b/playbooks/aws/openshift-cluster/update.yml
deleted file mode 100644
index ed05d61ed..000000000
--- a/playbooks/aws/openshift-cluster/update.yml
+++ /dev/null
@@ -1,34 +0,0 @@
----
-- hosts: localhost
-  gather_facts: no
-  tasks:
-  - include_vars: vars.yml
-  - include_vars: cluster_hosts.yml
-  - add_host:
-      name: "{{ item }}"
-      groups: l_oo_all_hosts
-    with_items: "{{ g_all_hosts }}"
-
-- hosts: l_oo_all_hosts
-  gather_facts: no
-  tasks:
-  - include_vars: vars.yml
-  - include_vars: cluster_hosts.yml
-
-- name: Update - Populate oo_hosts_to_update group
-  hosts: localhost
-  connection: local
-  become: no
-  gather_facts: no
-  tasks:
-  - name: Update - Evaluate oo_hosts_to_update
-    add_host:
-      name: "{{ item }}"
-      groups: oo_hosts_to_update
-      ansible_ssh_user: "{{ deployment_vars[deployment_type].ssh_user }}"
-      ansible_become: "{{ deployment_vars[deployment_type].become }}"
-    with_items: "{{ g_all_hosts | default([]) }}"
-
-- include: ../../common/openshift-cluster/update_repos_and_packages.yml
-
-- include: config.yml
diff --git a/playbooks/aws/openshift-cluster/vars.yml b/playbooks/aws/openshift-cluster/vars.yml
index b2b0716be..7810157d4 100644
--- a/playbooks/aws/openshift-cluster/vars.yml
+++ b/playbooks/aws/openshift-cluster/vars.yml
@@ -1,36 +1,4 @@
 ---
-debug_level: 2
-
-deployment_rhel7_ent_base:
-  # rhel-7.1, requires cloud access subscription
-  image: "{{ lookup('oo_option', 'ec2_image') | default('ami-10251c7a', True) }}"
-  image_name: "{{ lookup('oo_option', 'ec2_image_name') | default(None, True) }}"
-  region: "{{ lookup('oo_option', 'ec2_region') | default('us-east-1', True) }}"
-  ssh_user: ec2-user
-  become: yes
-  keypair: "{{ lookup('oo_option', 'ec2_keypair') | default('libra', True) }}"
-  type: "{{ lookup('oo_option', 'ec2_instance_type') | default('m4.large', True) }}"
-  security_groups: "{{ lookup('oo_option', 'ec2_security_groups') | default([ 'public' ], True) }}"
-  vpc_subnet: "{{ lookup('oo_option', 'ec2_vpc_subnet') | default(omit, True) }}"
-  assign_public_ip: "{{ lookup('oo_option', 'ec2_assign_public_ip') | default(omit, True) }}"
-
-deployment_vars:
-  origin:
-    # centos-7, requires marketplace
-    image: "{{ lookup('oo_option', 'ec2_image') | default('ami-6d1c2007', True) }}"
-    image_name: "{{ lookup('oo_option', 'ec2_image_name') | default(None, True) }}"
-    region: "{{ lookup('oo_option', 'ec2_region') | default('us-east-1', True) }}"
-    ssh_user: centos
-    become: yes
-    keypair: "{{ lookup('oo_option', 'ec2_keypair') | default('libra', True) }}"
-    type: "{{ lookup('oo_option', 'ec2_instance_type') | default('m4.large', True) }}"
-    security_groups: "{{ lookup('oo_option', 'ec2_security_groups') | default([ 'public' ], True) }}"
-    vpc_subnet: "{{ lookup('oo_option', 'ec2_vpc_subnet') | default(omit, True) }}"
-    assign_public_ip: "{{ lookup('oo_option', 'ec2_assign_public_ip') | default(omit, True) }}"
-
-  enterprise: "{{ deployment_rhel7_ent_base }}"
-  openshift-enterprise: "{{ deployment_rhel7_ent_base }}"
-  atomic-enterprise: "{{ deployment_rhel7_ent_base }}"
 
 clusterid: mycluster
 region: us-east-1
diff --git a/playbooks/byo/vagrant.yml b/playbooks/byo/vagrant.yml
deleted file mode 100644
index 76246e7b0..000000000
--- a/playbooks/byo/vagrant.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-- include: rhel_subscribe.yml
-
-- include: config.yml
diff --git a/playbooks/common/README.md b/playbooks/common/README.md
index 0b5e26989..968bd99cb 100644
--- a/playbooks/common/README.md
+++ b/playbooks/common/README.md
@@ -1,9 +1,8 @@
 # Common playbooks
 
 This directory has a generic set of playbooks that are included by playbooks in
-[`byo`](../byo), as well as other playbooks related to the
-[`bin/cluster`](../../bin) tool.
+[`byo`](../byo).
 
 Note: playbooks in this directory use generic group names that do not line up
-with the groups used by the `byo` playbooks or `bin/cluster` derived playbooks,
-requiring an explicit remapping of groups.
+with the groups used by the `byo` playbooks, requiring an explicit remapping of
+groups.
diff --git a/playbooks/common/openshift-etcd/service.yml b/playbooks/common/openshift-etcd/service.yml
deleted file mode 100644
index ced4bddc5..000000000
--- a/playbooks/common/openshift-etcd/service.yml
+++ /dev/null
@@ -1,23 +0,0 @@
----
-- name: Populate g_service_masters host group if needed
-  hosts: localhost
-  connection: local
-  become: no
-  gather_facts: no
-  tasks:
-  - fail: msg="new_cluster_state is required to be injected in this playbook"
-    when: new_cluster_state is not defined
-
-  - name: Evaluate g_service_etcd
-    add_host:
-      name: "{{ item }}"
-      groups: g_service_etcd
-    with_items: "{{ oo_host_group_exp | default([]) }}"
-    changed_when: False
-
-- name: Change etcd state on etcd instance(s)
-  hosts: g_service_etcd
-  connection: ssh
-  gather_facts: no
-  tasks:
-  - service: name=etcd state="{{ new_cluster_state }}"
diff --git a/playbooks/common/openshift-loadbalancer/service.yml b/playbooks/common/openshift-loadbalancer/service.yml
deleted file mode 100644
index d3762c961..000000000
--- a/playbooks/common/openshift-loadbalancer/service.yml
+++ /dev/null
@@ -1,23 +0,0 @@
----
-- name: Populate g_service_nodes host group if needed
-  hosts: localhost
-  connection: local
-  become: no
-  gather_facts: no
-  tasks:
-  - fail: msg="new_cluster_state is required to be injected in this playbook"
-    when: new_cluster_state is not defined
-
-  - name: Evaluate g_service_lb
-    add_host:
-      name: "{{ item }}"
-      groups: g_service_lb
-    with_items: "{{ oo_host_group_exp | default([]) }}"
-    changed_when: False
-
-- name: Change state on lb instance(s)
-  hosts: g_service_lb
-  connection: ssh
-  gather_facts: no
-  tasks:
-  - service: name=haproxy state="{{ new_cluster_state }}"
diff --git a/playbooks/common/openshift-master/service.yml b/playbooks/common/openshift-master/service.yml
deleted file mode 100644
index 48a2731aa..000000000
--- a/playbooks/common/openshift-master/service.yml
+++ /dev/null
@@ -1,23 +0,0 @@
----
-- name: Populate g_service_masters host group if needed
-  hosts: localhost
-  gather_facts: no
-  connection: local
-  become: no
-  tasks:
-  - fail: msg="new_cluster_state is required to be injected in this playbook"
-    when: new_cluster_state is not defined
-
-  - name: Evaluate g_service_masters
-    add_host:
-      name: "{{ item }}"
-      groups: g_service_masters
-    with_items: "{{ oo_host_group_exp | default([]) }}"
-    changed_when: False
-
-- name: Change state on master instance(s)
-  hosts: g_service_masters
-  connection: ssh
-  gather_facts: no
-  tasks:
-  - service: name={{ openshift.common.service_type }}-master state="{{ new_cluster_state }}"
diff --git a/playbooks/common/openshift-nfs/service.yml b/playbooks/common/openshift-nfs/service.yml
deleted file mode 100644
index b1e35e4b1..000000000
--- a/playbooks/common/openshift-nfs/service.yml
+++ /dev/null
@@ -1,21 +0,0 @@
----
-- name: Populate g_service_nfs host group if needed
-  hosts: localhost
-  gather_facts: no
-  tasks:
-  - fail: msg="new_cluster_state is required to be injected in this playbook"
-    when: new_cluster_state is not defined
-
-  - name: Evaluate g_service_nfs
-    add_host:
-      name: "{{ item }}"
-      groups: g_service_nfs
-    with_items: "{{ oo_host_group_exp | default([]) }}"
-    changed_when: False
-
-- name: Change state on nfs instance(s)
-  hosts: g_service_nfs
-  connection: ssh
-  gather_facts: no
-  tasks:
-  - service: name=nfs-server state="{{ new_cluster_state }}"
diff --git a/playbooks/common/openshift-node/service.yml b/playbooks/common/openshift-node/service.yml
deleted file mode 100644
index 130a5416f..000000000
--- a/playbooks/common/openshift-node/service.yml
+++ /dev/null
@@ -1,26 +0,0 @@
----
-- name: Populate g_service_nodes host group if needed
-  hosts: localhost
-  connection: local
-  become: no
-  gather_facts: no
-  tasks:
-  - fail: msg="new_cluster_state is required to be injected in this playbook"
-    when: new_cluster_state is not defined
-
-  - name: Evaluate g_service_nodes
-    add_host:
-      name: "{{ item }}"
-      groups: g_service_nodes
-    with_items: "{{ oo_host_group_exp | default([]) }}"
-    changed_when: False
-
-- name: Change state on node instance(s)
-  hosts: g_service_nodes
-  connection: ssh
-  gather_facts: no
-  tasks:
-  - name: Change state on node instance(s)
-    service:
-      name: "{{ service_type }}-node"
-      state: "{{ new_cluster_state }}"
diff --git a/playbooks/gce/README.md b/playbooks/gce/README.md
deleted file mode 100644
index 0514d6f50..000000000
--- a/playbooks/gce/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-# GCE playbooks
-
-This playbook directory is meant to be driven by [`bin/cluster`](../../bin),
-which is community supported and most use is considered deprecated.
diff --git a/playbooks/gce/openshift-cluster/add_nodes.yml b/playbooks/gce/openshift-cluster/add_nodes.yml
deleted file mode 100644
index 765e03fdc..000000000
--- a/playbooks/gce/openshift-cluster/add_nodes.yml
+++ /dev/null
@@ -1,43 +0,0 @@
----
-- name: Launch instance(s)
-  hosts: localhost
-  connection: local
-  become: no
-  gather_facts: no
-  vars_files:
-  - vars.yml
-  vars:
-    oo_extend_env: True
-  tasks:
-  - fail:
-      msg: Deployment type not supported for gce provider yet
-    when: deployment_type == 'enterprise'
-
-  - include: ../../common/openshift-cluster/tasks/set_node_launch_facts.yml
-    vars:
-      type: "compute"
-      count: "{{ num_nodes }}"
-  - include: tasks/launch_instances.yml
-    vars:
-      instances: "{{ node_names }}"
-      cluster: "{{ cluster_id }}"
-      type: "{{ k8s_type }}"
-      g_sub_host_type: "{{ sub_host_type }}"
-      gce_machine_type: "{{ lookup('env', 'gce_machine_node_type') | default(lookup('env', 'gce_machine_type'), true) }}"
-      gce_machine_image: "{{ lookup('env', 'gce_machine_node_image') | default(lookup('env', 'gce_machine_image'), true) }}"
-
-  - include: ../../common/openshift-cluster/tasks/set_node_launch_facts.yml
-    vars:
-      type: "infra"
-      count: "{{ num_infra }}"
-  - include: tasks/launch_instances.yml
-    vars:
-      instances: "{{ node_names }}"
-      cluster: "{{ cluster_id }}"
-      type: "{{ k8s_type }}"
-      g_sub_host_type: "{{ sub_host_type }}"
-      gce_machine_type: "{{ lookup('env', 'gce_machine_node_type') | default(lookup('env', 'gce_machine_type'), true) }}"
-      gce_machine_image: "{{ lookup('env', 'gce_machine_node_image') | default(lookup('env', 'gce_machine_image'), true) }}"
-
-- include: scaleup.yml
-- include: list.yml
diff --git a/playbooks/gce/openshift-cluster/cluster_hosts.yml b/playbooks/gce/openshift-cluster/cluster_hosts.yml
deleted file mode 100644
index e5f41382b..000000000
--- a/playbooks/gce/openshift-cluster/cluster_hosts.yml
+++ /dev/null
@@ -1,25 +0,0 @@
----
-g_all_hosts: "{{ groups['tag_clusterid-' ~ cluster_id] | default([])
-                 | intersect(groups['tag_environment-' ~ cluster_env] | default([])) }}"
-
-g_etcd_hosts: "{{ g_all_hosts | intersect(groups['tag_host-type-etcd'] | default([])) }}"
-
-g_new_etcd_hosts: "{{ g_all_hosts | intersect(groups['tag_host-type-new_etcd'] | default([])) }}"
-
-g_lb_hosts: "{{ g_all_hosts | intersect(groups['tag_host-type-lb'] | default([])) }}"
-
-g_nfs_hosts: "{{ g_all_hosts | intersect(groups['tag_host-type-nfs'] | default([])) }}"
-
-g_glusterfs_hosts: "{{ g_all_hosts | intersect(groups['tag_host-type-glusterfs'] | default([])) }}"
-
-g_master_hosts: "{{ g_all_hosts | intersect(groups['tag_host-type-master'] | default([])) }}"
-
-g_new_master_hosts: "{{ g_all_hosts | intersect(groups['tag_host-type-new-master'] | default([])) }}"
-
-g_node_hosts: "{{ g_all_hosts | intersect(groups['tag_host-type-node'] | default([])) }}"
-
-g_new_node_hosts: "{{ g_all_hosts | intersect(groups['tag_host-type-new-node'] | default([])) }}"
-
-g_infra_hosts: "{{ g_node_hosts | intersect(groups['tag_sub-host-type-infra'] | default([])) }}"
-
-g_compute_hosts: "{{ g_node_hosts | intersect(groups['tag_sub-host-type-compute'] | default([])) }}"
diff --git a/playbooks/gce/openshift-cluster/config.yml b/playbooks/gce/openshift-cluster/config.yml
deleted file mode 100644
index 2625d4d05..000000000
--- a/playbooks/gce/openshift-cluster/config.yml
+++ /dev/null
@@ -1,36 +0,0 @@
----
-- hosts: localhost
-  gather_facts: no
-  tasks:
-  - include_vars: vars.yml
-  - include_vars: cluster_hosts.yml
-  - add_host:
-      name: "{{ item }}"
-      groups: l_oo_all_hosts
-      ansible_ssh_user: "{{ deployment_vars[deployment_type].ssh_user }}"
-      ansible_become: "{{ deployment_vars[deployment_type].become }}"
-    with_items: "{{ g_all_hosts | default([]) }}"
-
-- hosts: l_oo_all_hosts
-  gather_facts: no
-  tasks:
-  - include_vars: vars.yml
-  - include_vars: cluster_hosts.yml
-
-- include: ../../common/openshift-cluster/config.yml
-  vars:
-    g_ssh_user: "{{ deployment_vars[deployment_type].ssh_user }}"
-    g_sudo: "{{ deployment_vars[deployment_type].become }}"
-    g_nodeonmaster: true
-    openshift_cluster_id: "{{ cluster_id }}"
-    openshift_debug_level: "{{ debug_level }}"
-    openshift_deployment_type: "{{ deployment_type }}"
-    openshift_hostname: "{{ gce_private_ip }}"
-    openshift_hosted_registry_selector: 'type=infra'
-    openshift_hosted_router_selector: 'type=infra'
-    openshift_master_cluster_method: 'native'
-    openshift_use_openshift_sdn: "{{ lookup('oo_option', 'use_openshift_sdn') }}"
-    os_sdn_network_plugin_name: "{{ lookup('oo_option', 'sdn_network_plugin_name') }}"
-    openshift_use_flannel: "{{ lookup('oo_option', 'use_flannel') }}"
-    openshift_use_calico: "{{ lookup('oo_option', 'use_calico') }}"
-    openshift_use_fluentd: "{{ lookup('oo_option', 'use_fluentd') }}"
diff --git a/playbooks/gce/openshift-cluster/filter_plugins b/playbooks/gce/openshift-cluster/filter_plugins
deleted file mode 120000
index 99a95e4ca..000000000
--- a/playbooks/gce/openshift-cluster/filter_plugins
+++ /dev/null
@@ -1 +0,0 @@
-../../../filter_plugins
\ No newline at end of file
diff --git a/playbooks/gce/openshift-cluster/launch.yml b/playbooks/gce/openshift-cluster/launch.yml
deleted file mode 100644
index 7532a678b..000000000
--- a/playbooks/gce/openshift-cluster/launch.yml
+++ /dev/null
@@ -1,67 +0,0 @@
----
-- name: Launch instance(s)
-  hosts: localhost
-  connection: local
-  become: no
-  gather_facts: no
-  vars_files:
-  - vars.yml
-  tasks:
-  - fail: msg="Deployment type not supported for gce provider yet"
-    when: deployment_type == 'enterprise'
-
-  - include: ../../common/openshift-cluster/tasks/set_etcd_launch_facts.yml
-  - include: tasks/launch_instances.yml
-    vars:
-      instances: "{{ etcd_names }}"
-      cluster: "{{ cluster_id }}"
-      type: "{{ k8s_type }}"
-      g_sub_host_type: "default"
-      gce_machine_type: "{{ lookup('env', 'gce_machine_etcd_type') | default(lookup('env', 'gce_machine_type'), true) }}"
-      gce_machine_image: "{{ lookup('env', 'gce_machine_etcd_image') | default(lookup('env', 'gce_machine_image'), true) }}"
-
-
-  - include: ../../common/openshift-cluster/tasks/set_master_launch_facts.yml
-  - include: tasks/launch_instances.yml
-    vars:
-      instances: "{{ master_names }}"
-      cluster: "{{ cluster_id }}"
-      type: "{{ k8s_type }}"
-      g_sub_host_type: "default"
-      gce_machine_type: "{{ lookup('env', 'gce_machine_master_type') | default(lookup('env', 'gce_machine_type'), true) }}"
-      gce_machine_image: "{{ lookup('env', 'gce_machine_master_image') | default(lookup('env', 'gce_machine_image'), true) }}"
-
-  - include: ../../common/openshift-cluster/tasks/set_node_launch_facts.yml
-    vars:
-      type: "compute"
-      count: "{{ num_nodes }}"
-  - include: tasks/launch_instances.yml
-    vars:
-      instances: "{{ node_names }}"
-      cluster: "{{ cluster_id }}"
-      type: "{{ k8s_type }}"
-      g_sub_host_type: "{{ sub_host_type }}"
-      gce_machine_type: "{{ lookup('env', 'gce_machine_node_type') | default(lookup('env', 'gce_machine_type'), true) }}"
-      gce_machine_image: "{{ lookup('env', 'gce_machine_node_image') | default(lookup('env', 'gce_machine_image'), true) }}"
-
-  - include: ../../common/openshift-cluster/tasks/set_node_launch_facts.yml
-    vars:
-      type: "infra"
-      count: "{{ num_infra }}"
-  - include: tasks/launch_instances.yml
-    vars:
-      instances: "{{ node_names }}"
-      cluster: "{{ cluster_id }}"
-      type: "{{ k8s_type }}"
-      g_sub_host_type: "{{ sub_host_type }}"
-      gce_machine_type: "{{ lookup('env', 'gce_machine_node_type') | default(lookup('env', 'gce_machine_type'), true) }}"
-      gce_machine_image: "{{ lookup('env', 'gce_machine_node_image') | default(lookup('env', 'gce_machine_image'), true) }}"
-
-  - add_host:
-      name: "{{ master_names.0 }}"
-      groups: service_master
-    when: master_names is defined and master_names.0 is defined
-
-- include: update.yml
-
-- include: list.yml
diff --git a/playbooks/gce/openshift-cluster/list.yml b/playbooks/gce/openshift-cluster/list.yml
deleted file mode 100644
index 34ab09533..000000000
--- a/playbooks/gce/openshift-cluster/list.yml
+++ /dev/null
@@ -1,23 +0,0 @@
----
-- name: Generate oo_list_hosts group
-  hosts: localhost
-  connection: local
-  become: no
-  gather_facts: no
-  vars_files:
-  - vars.yml
-  tasks:
-  - set_fact: scratch_group=tag_clusterid-{{ cluster_id }}
-    when: cluster_id != ''
-  - set_fact: scratch_group=all
-    when: cluster_id == ''
-  - add_host:
-      name: "{{ item }}"
-      groups: oo_list_hosts
-      ansible_ssh_user: "{{ deployment_vars[deployment_type].ssh_user }}"
-      ansible_become: "{{ deployment_vars[deployment_type].become }}"
-      oo_public_ipv4: "{{ hostvars[item].gce_public_ip }}"
-      oo_private_ipv4: "{{ hostvars[item].gce_private_ip }}"
-    with_items: "{{ groups[scratch_group] | default([], true) | difference(['localhost']) | difference(groups.status_terminated | default([], true)) }}"
-  - debug:
-      msg: "{{ hostvars | oo_select_keys(groups[scratch_group] | default([])) | oo_pretty_print_cluster }}"
diff --git a/playbooks/gce/openshift-cluster/lookup_plugins b/playbooks/gce/openshift-cluster/lookup_plugins
deleted file mode 120000
index ac79701db..000000000
--- a/playbooks/gce/openshift-cluster/lookup_plugins
+++ /dev/null
@@ -1 +0,0 @@
-../../../lookup_plugins
\ No newline at end of file
diff --git a/playbooks/gce/openshift-cluster/roles b/playbooks/gce/openshift-cluster/roles
deleted file mode 120000
index 20c4c58cf..000000000
--- a/playbooks/gce/openshift-cluster/roles
+++ /dev/null
@@ -1 +0,0 @@
-../../../roles
\ No newline at end of file
diff --git a/playbooks/gce/openshift-cluster/service.yml b/playbooks/gce/openshift-cluster/service.yml
deleted file mode 100644
index 13b267976..000000000
--- a/playbooks/gce/openshift-cluster/service.yml
+++ /dev/null
@@ -1,29 +0,0 @@
----
-- name: Call same systemctl command for openshift on all instance(s)
-  hosts: localhost
-  connection: local
-  become: no
-  gather_facts: no
-  vars_files:
-  - vars.yml
-  - cluster_hosts.yml
-  tasks:
-  - fail: msg="cluster_id is required to be injected in this playbook"
-    when: cluster_id is not defined
-
-  - add_host:
-      name: "{{ item }}"
-      groups: g_service_nodes
-      ansible_ssh_user: "{{ deployment_vars[deployment_type].ssh_user }}"
-      ansible_become: "{{ deployment_vars[deployment_type].become }}"
-    with_items: "{{ node_hosts | default([]) | difference(['localhost']) | difference(groups.status_terminated) }}"
-
-  - add_host:
-      name: "{{ item }}"
-      groups: g_service_masters
-      ansible_ssh_user: "{{ deployment_vars[deployment_type].ssh_user }}"
-      ansible_become: "{{ deployment_vars[deployment_type].become }}"
-    with_items: "{{ master_hosts | default([]) | difference(['localhost']) | difference(groups.status_terminated) }}"
-
-- include: ../../common/openshift-node/service.yml
-- include: ../../common/openshift-master/service.yml
diff --git a/playbooks/gce/openshift-cluster/tasks/launch_instances.yml b/playbooks/gce/openshift-cluster/tasks/launch_instances.yml
deleted file mode 100644
index 65dd2b71e..000000000
--- a/playbooks/gce/openshift-cluster/tasks/launch_instances.yml
+++ /dev/null
@@ -1,65 +0,0 @@
----
-- name: Launch instance(s)
-  gce:
-    instance_names: "{{ instances|join(',') }}"
-    machine_type: "{{ gce_machine_type | default(deployment_vars[deployment_type].machine_type, true) }}"
-    image: "{{ gce_machine_image | default(deployment_vars[deployment_type].image, true) }}"
-    service_account_email: "{{ lookup('env', 'gce_service_account_email_address') }}"
-    pem_file: "{{ lookup('env', 'gce_service_account_pem_file_path') }}"
-    project_id: "{{ lookup('env', 'gce_project_id') }}"
-    zone: "{{ lookup('env', 'zone') }}"
-    network: "{{ lookup('env', 'network') }}"
-    subnetwork: "{{ lookup('env', 'subnetwork') | default(omit, True) }}"
-    # unsupported in 1.9.+
-    #service_account_permissions: "datastore,logging-write"
-    tags:
-      - created-by-{{ lookup('env', 'LOGNAME') | regex_replace('[^a-z0-9]+', '') | default(cluster, true) }}
-      - environment-{{ cluster_env }}
-      - clusterid-{{ cluster_id }}
-      - host-type-{{ type }}
-      - sub-host-type-{{ g_sub_host_type }}
-    metadata:
-      startup-script: |
-        #!/bin/bash
-        echo "Defaults:{{ deployment_vars[deployment_type].ssh_user }} !requiretty" > /etc/sudoers.d/99-{{ deployment_vars[deployment_type].ssh_user }}
-
-  when: instances |length > 0
-  register: gce
-
-- set_fact:
-    node_label:
-      # There doesn't seem to be a way to get the region directly, so parse it out of the zone.
-      region: "{{ gce.zone | regex_replace('^(.*)-.*$', '\\\\1') }}"
-      type: "{{ g_sub_host_type }}"
-  when: instances |length > 0 and type == "node"
-
-- set_fact:
-    node_label:
-      # There doesn't seem to be a way to get the region directly, so parse it out of the zone.
-      region: "{{ gce.zone | regex_replace('^(.*)-.*$', '\\\\1') }}"
-      type: "{{ type }}"
-  when: instances |length > 0 and type != "node"
-
-- name: Add new instances to groups and set variables needed
-  add_host:
-    hostname: "{{ item.name }}"
-    ansible_ssh_host: "{{ item.public_ip }}"
-    ansible_ssh_user: "{{ deployment_vars[deployment_type].ssh_user }}"
-    ansible_become: "{{ deployment_vars[deployment_type].become }}"
-    groups: "{{ item.tags | oo_prepend_strings_in_list('tag_') | join(',') }}"
-    gce_public_ip: "{{ item.public_ip }}"
-    gce_private_ip: "{{ item.private_ip }}"
-    openshift_node_labels: "{{ node_label }}"
-  with_items: "{{ gce.instance_data | default([], true) }}"
-
-- name: Wait for ssh
-  wait_for: port=22 host={{ item.public_ip }}
-  with_items: "{{ gce.instance_data | default([], true) }}"
-
-- name: Wait for user setup
-  command: "ssh -o StrictHostKeyChecking=no -o PasswordAuthentication=no -o ConnectTimeout=10 -o UserKnownHostsFile=/dev/null {{ hostvars[item.name].ansible_ssh_user }}@{{ item.public_ip }} echo {{ hostvars[item.name].ansible_ssh_user }} user is setup"
-  register: result
-  until: result.rc == 0
-  retries: 30
-  delay: 5
-  with_items: "{{ gce.instance_data | default([], true) }}"
diff --git a/playbooks/gce/openshift-cluster/terminate.yml b/playbooks/gce/openshift-cluster/terminate.yml
deleted file mode 100644
index afe269b7c..000000000
--- a/playbooks/gce/openshift-cluster/terminate.yml
+++ /dev/null
@@ -1,58 +0,0 @@
----
-- name: Terminate instance(s)
-  hosts: localhost
-  connection: local
-  become: no
-  gather_facts: no
-  vars_files:
-  - vars.yml
-  tasks:
-  - add_host:
-      name: "{{ item }}"
-      groups: oo_hosts_to_terminate
-      ansible_ssh_user: "{{ deployment_vars[deployment_type].ssh_user }}"
-      ansible_become: "{{ deployment_vars[deployment_type].become }}"
-    with_items: "{{ (groups['tag_clusterid-' ~ cluster_id] | default([])) | difference(['localhost']) }}"
-
-- name: Unsubscribe VMs
-  hosts: oo_hosts_to_terminate
-  vars_files:
-  - vars.yml
-  roles:
-  - role: rhel_unsubscribe
-    when: deployment_type in ['atomic-enterprise', 'enterprise', 'openshift-enterprise'] and
-          ansible_distribution == "RedHat" and
-          lookup('oo_option', 'rhel_skip_subscription') | default(rhsub_skip, True) |
-            default('no', True) | lower in ['no', 'false']
-
-- name: Terminate instances(s)
-  hosts: localhost
-  become: no
-  connection: local
-  gather_facts: no
-  vars_files:
-  - vars.yml
-  tasks:
-  - name: Terminate instances that were previously launched
-    local_action:
-      module: gce
-      state: 'absent'
-      name: "{{ item }}"
-      service_account_email: "{{ lookup('env', 'gce_service_account_email_address') }}"
-      pem_file: "{{ lookup('env', 'gce_service_account_pem_file_path') }}"
-      project_id: "{{ lookup('env', 'gce_project_id') }}"
-      zone: "{{ lookup('env', 'zone') }}"
-    with_items: "{{ groups['oo_hosts_to_terminate'] | default([], true) }}"
-    when: item is defined
-
-#- include: ../openshift-node/terminate.yml
-#  vars:
-#    gce_service_account_email: "{{ lookup('env', 'gce_service_account_email_address') }}"
-#    gce_pem_file: "{{ lookup('env', 'gce_service_account_pem_file_path') }}"
-#    gce_project_id: "{{ lookup('env', 'gce_project_id') }}"
-#
-#- include: ../openshift-master/terminate.yml
-#  vars:
-#    gce_service_account_email: "{{ lookup('env', 'gce_service_account_email_address') }}"
-#    gce_pem_file: "{{ lookup('env', 'gce_service_account_pem_file_path') }}"
-#    gce_project_id: "{{ lookup('env', 'gce_project_id') }}"
diff --git a/playbooks/gce/openshift-cluster/update.yml b/playbooks/gce/openshift-cluster/update.yml
deleted file mode 100644
index 6d2af3d26..000000000
--- a/playbooks/gce/openshift-cluster/update.yml
+++ /dev/null
@@ -1,34 +0,0 @@
----
-- hosts: localhost
-  gather_facts: no
-  tasks:
-  - include_vars: vars.yml
-  - include_vars: cluster_hosts.yml
-  - add_host:
-      name: "{{ item }}"
-      groups: l_oo_all_hosts
-    with_items: "{{ g_all_hosts }}"
-
-- hosts: l_oo_all_hosts
-  gather_facts: no
-  tasks:
-  - include_vars: vars.yml
-  - include_vars: cluster_hosts.yml
-
-- name: Populate oo_hosts_to_update group
-  hosts: localhost
-  connection: local
-  become: no
-  gather_facts: no
-  tasks:
-  - name: Evaluate oo_hosts_to_update
-    add_host:
-      name: "{{ item }}"
-      groups: oo_hosts_to_update
-      ansible_ssh_user: "{{ deployment_vars[deployment_type].ssh_user }}"
-      ansible_become: "{{ deployment_vars[deployment_type].become }}"
-    with_items: "{{ g_all_hosts | default([]) }}"
-
-- include: ../../common/openshift-cluster/update_repos_and_packages.yml
-
-- include: config.yml
diff --git a/playbooks/gce/openshift-cluster/vars.yml b/playbooks/gce/openshift-cluster/vars.yml
deleted file mode 100644
index 13c754c1e..000000000
--- a/playbooks/gce/openshift-cluster/vars.yml
+++ /dev/null
@@ -1,18 +0,0 @@
----
-debug_level: 2
-
-deployment_rhel7_ent_base:
-  image: "{{ lookup('oo_option', 'image_name') | default('rhel-7', True) }}"
-  machine_type: "{{ lookup('oo_option', 'machine_type') | default('n1-standard-1', True) }}"
-  ssh_user: "{{ lookup('env', 'gce_ssh_user') |  default(ansible_ssh_user, true) }}"
-  become: yes
-
-deployment_vars:
-  origin:
-    image: "{{ lookup('oo_option', 'image_name') | default('centos-7', True) }}"
-    machine_type: "{{ lookup('oo_option', 'machine_type') | default('n1-standard-1', True) }}"
-    ssh_user: "{{ lookup('env', 'gce_ssh_user') |  default(ansible_ssh_user, true) }}"
-    become: yes
-  enterprise: "{{ deployment_rhel7_ent_base }}"
-  openshift-enterprise: "{{ deployment_rhel7_ent_base }}"
-  atomic-enterprise: "{{ deployment_rhel7_ent_base }}"
diff --git a/playbooks/libvirt/README.md b/playbooks/libvirt/README.md
deleted file mode 100644
index 3ce46a76f..000000000
--- a/playbooks/libvirt/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-# libvirt playbooks
-
-This playbook directory is meant to be driven by [`bin/cluster`](../../bin),
-which is community supported and most use is considered deprecated.
diff --git a/playbooks/libvirt/openshift-cluster/cluster_hosts.yml b/playbooks/libvirt/openshift-cluster/cluster_hosts.yml
deleted file mode 100644
index e5f41382b..000000000
--- a/playbooks/libvirt/openshift-cluster/cluster_hosts.yml
+++ /dev/null
@@ -1,25 +0,0 @@
----
-g_all_hosts: "{{ groups['tag_clusterid-' ~ cluster_id] | default([])
-                 | intersect(groups['tag_environment-' ~ cluster_env] | default([])) }}"
-
-g_etcd_hosts: "{{ g_all_hosts | intersect(groups['tag_host-type-etcd'] | default([])) }}"
-
-g_new_etcd_hosts: "{{ g_all_hosts | intersect(groups['tag_host-type-new_etcd'] | default([])) }}"
-
-g_lb_hosts: "{{ g_all_hosts | intersect(groups['tag_host-type-lb'] | default([])) }}"
-
-g_nfs_hosts: "{{ g_all_hosts | intersect(groups['tag_host-type-nfs'] | default([])) }}"
-
-g_glusterfs_hosts: "{{ g_all_hosts | intersect(groups['tag_host-type-glusterfs'] | default([])) }}"
-
-g_master_hosts: "{{ g_all_hosts | intersect(groups['tag_host-type-master'] | default([])) }}"
-
-g_new_master_hosts: "{{ g_all_hosts | intersect(groups['tag_host-type-new-master'] | default([])) }}"
-
-g_node_hosts: "{{ g_all_hosts | intersect(groups['tag_host-type-node'] | default([])) }}"
-
-g_new_node_hosts: "{{ g_all_hosts | intersect(groups['tag_host-type-new-node'] | default([])) }}"
-
-g_infra_hosts: "{{ g_node_hosts | intersect(groups['tag_sub-host-type-infra'] | default([])) }}"
-
-g_compute_hosts: "{{ g_node_hosts | intersect(groups['tag_sub-host-type-compute'] | default([])) }}"
diff --git a/playbooks/libvirt/openshift-cluster/config.yml b/playbooks/libvirt/openshift-cluster/config.yml
deleted file mode 100644
index 569e00da2..000000000
--- a/playbooks/libvirt/openshift-cluster/config.yml
+++ /dev/null
@@ -1,39 +0,0 @@
----
-# TODO: need to figure out a plan for setting hostname, currently the default
-# is localhost, so no hostname value (or public_hostname) value is getting
-# assigned
-
-- include: ../../common/openshift-cluster/std_include.yml
-
-- hosts: localhost
-  gather_facts: no
-  tasks:
-  - include_vars: vars.yml
-  - include_vars: cluster_hosts.yml
-  - add_host:
-      name: "{{ item }}"
-      groups: l_oo_all_hosts
-    with_items: "{{ g_all_hosts | default([]) }}"
-
-- hosts: l_oo_all_hosts
-  gather_facts: no
-  tasks:
-  - include_vars: vars.yml
-  - include_vars: cluster_hosts.yml
-
-- include: ../../common/openshift-cluster/config.yml
-  vars:
-    g_ssh_user: "{{ deployment_vars[deployment_type].ssh_user }}"
-    g_sudo: "{{ deployment_vars[deployment_type].become }}"
-    g_nodeonmaster: true
-    openshift_cluster_id: "{{ cluster_id }}"
-    openshift_debug_level: "{{ debug_level }}"
-    openshift_deployment_type: "{{ deployment_type }}"
-    openshift_hosted_registry_selector: 'type=infra'
-    openshift_hosted_router_selector: 'type=infra'
-    openshift_master_cluster_method: 'native'
-    openshift_use_openshift_sdn: "{{ lookup('oo_option', 'use_openshift_sdn') }}"
-    os_sdn_network_plugin_name: "{{ lookup('oo_option', 'sdn_network_plugin_name') }}"
-    openshift_use_flannel: "{{ lookup('oo_option', 'use_flannel') }}"
-    openshift_use_calico: "{{ lookup('oo_option', 'use_calico') }}"
-    openshift_use_fluentd: "{{ lookup('oo_option', 'use_fluentd') }}"
diff --git a/playbooks/libvirt/openshift-cluster/filter_plugins b/playbooks/libvirt/openshift-cluster/filter_plugins
deleted file mode 120000
index 99a95e4ca..000000000
--- a/playbooks/libvirt/openshift-cluster/filter_plugins
+++ /dev/null
@@ -1 +0,0 @@
-../../../filter_plugins
\ No newline at end of file
diff --git a/playbooks/libvirt/openshift-cluster/launch.yml b/playbooks/libvirt/openshift-cluster/launch.yml
deleted file mode 100644
index 2475b9d6b..000000000
--- a/playbooks/libvirt/openshift-cluster/launch.yml
+++ /dev/null
@@ -1,57 +0,0 @@
----
-- name: Launch instance(s)
-  hosts: localhost
-  become: no
-  connection: local
-  gather_facts: no
-  vars_files:
-  - vars.yml
-  vars:
-    image_url: "{{ deployment_vars[deployment_type].image.url }}"
-    image_sha256: "{{ deployment_vars[deployment_type].image.sha256 }}"
-    image_name: "{{ deployment_vars[deployment_type].image.name }}"
-    image_compression: "{{ deployment_vars[deployment_type].image.compression }}"
-  tasks:
-  - include: tasks/configure_libvirt.yml
-
-  - include: ../../common/openshift-cluster/tasks/set_etcd_launch_facts.yml
-  - include: tasks/launch_instances.yml
-    vars:
-      instances: "{{ etcd_names }}"
-      cluster: "{{ cluster_id }}"
-      type: "{{ k8s_type }}"
-      g_sub_host_type: "default"
-
-  - include: ../../common/openshift-cluster/tasks/set_master_launch_facts.yml
-  - include: tasks/launch_instances.yml
-    vars:
-      instances: "{{ master_names }}"
-      cluster: "{{ cluster_id }}"
-      type: "{{ k8s_type }}"
-      g_sub_host_type: "default"
-
-  - include: ../../common/openshift-cluster/tasks/set_node_launch_facts.yml
-    vars:
-      type: "compute"
-      count: "{{ num_nodes }}"
-  - include: tasks/launch_instances.yml
-    vars:
-      instances: "{{ node_names }}"
-      cluster: "{{ cluster_id }}"
-      type: "{{ k8s_type }}"
-      g_sub_host_type: "{{ sub_host_type }}"
-
-  - include: ../../common/openshift-cluster/tasks/set_node_launch_facts.yml
-    vars:
-      type: "infra"
-      count: "{{ num_infra }}"
-  - include: tasks/launch_instances.yml
-    vars:
-      instances: "{{ node_names }}"
-      cluster: "{{ cluster_id }}"
-      type: "{{ k8s_type }}"
-      g_sub_host_type: "{{ sub_host_type }}"
-
-- include: update.yml
-
-- include: list.yml
diff --git a/playbooks/libvirt/openshift-cluster/list.yml b/playbooks/libvirt/openshift-cluster/list.yml
deleted file mode 100644
index 579cd7ac6..000000000
--- a/playbooks/libvirt/openshift-cluster/list.yml
+++ /dev/null
@@ -1,23 +0,0 @@
----
-- name: Generate oo_list_hosts group
-  hosts: localhost
-  become: no
-  connection: local
-  gather_facts: no
-  vars_files:
-  - vars.yml
-  tasks:
-  - set_fact: scratch_group=tag_clusterid-{{ cluster_id }}
-    when: cluster_id != ''
-  - set_fact: scratch_group=all
-    when: cluster_id == ''
-  - add_host:
-      name: "{{ item }}"
-      groups: oo_list_hosts
-      ansible_ssh_user: "{{ deployment_vars[deployment_type].ssh_user }}"
-      ansible_become: "{{ deployment_vars[deployment_type].become }}"
-      oo_public_ipv4: ""
-      oo_private_ipv4: "{{ hostvars[item].libvirt_ip_address }}"
-    with_items: "{{ groups[scratch_group] | default([]) | difference(['localhost']) }}"
-  - debug:
-      msg: "{{ hostvars | oo_select_keys(groups[scratch_group] | default([])) | oo_pretty_print_cluster }}"
diff --git a/playbooks/libvirt/openshift-cluster/lookup_plugins b/playbooks/libvirt/openshift-cluster/lookup_plugins
deleted file mode 120000
index ac79701db..000000000
--- a/playbooks/libvirt/openshift-cluster/lookup_plugins
+++ /dev/null
@@ -1 +0,0 @@
-../../../lookup_plugins
\ No newline at end of file
diff --git a/playbooks/libvirt/openshift-cluster/roles b/playbooks/libvirt/openshift-cluster/roles
deleted file mode 120000
index 20c4c58cf..000000000
--- a/playbooks/libvirt/openshift-cluster/roles
+++ /dev/null
@@ -1 +0,0 @@
-../../../roles
\ No newline at end of file
diff --git a/playbooks/libvirt/openshift-cluster/service.yml b/playbooks/libvirt/openshift-cluster/service.yml
deleted file mode 100644
index 8bd24a8cf..000000000
--- a/playbooks/libvirt/openshift-cluster/service.yml
+++ /dev/null
@@ -1,34 +0,0 @@
----
-# TODO: need to figure out a plan for setting hostname, currently the default
-# is localhost, so no hostname value (or public_hostname) value is getting
-# assigned
-
-- name: Call same systemctl command for openshift on all instance(s)
-  hosts: localhost
-  become: no
-  connection: local
-  gather_facts: no
-  vars_files:
-  - vars.yml
-  tasks:
-  - fail: msg="cluster_id is required to be injected in this playbook"
-    when: cluster_id is not defined
-
-  - name: Evaluate g_service_masters
-    add_host:
-      name: "{{ item }}"
-      ansible_ssh_user: "{{ deployment_vars[deployment_type].ssh_user }}"
-      ansible_become: "{{ deployment_vars[deployment_type].become }}"
-      groups: g_service_masters
-    with_items: "{{ g_master_hosts | default([]) }}"
-
-  - name: Evaluate g_service_nodes
-    add_host:
-      name: "{{ item }}"
-      ansible_ssh_user: "{{ deployment_vars[deployment_type].ssh_user }}"
-      ansible_become: "{{ deployment_vars[deployment_type].become }}"
-      groups: g_service_nodes
-    with_items: "{{ g_node_hosts | default([]) }}"
-
-- include: ../../common/openshift-node/service.yml
-- include: ../../common/openshift-master/service.yml
diff --git a/playbooks/libvirt/openshift-cluster/tasks/configure_libvirt.yml b/playbooks/libvirt/openshift-cluster/tasks/configure_libvirt.yml
deleted file mode 100644
index f237c1a60..000000000
--- a/playbooks/libvirt/openshift-cluster/tasks/configure_libvirt.yml
+++ /dev/null
@@ -1,6 +0,0 @@
----
-- include: configure_libvirt_storage_pool.yml
-  when: libvirt_storage_pool is defined and libvirt_storage_pool_path is defined
-
-- include: configure_libvirt_network.yml
-  when: libvirt_network is defined
diff --git a/playbooks/libvirt/openshift-cluster/tasks/configure_libvirt_network.yml b/playbooks/libvirt/openshift-cluster/tasks/configure_libvirt_network.yml
deleted file mode 100644
index b42ca83af..000000000
--- a/playbooks/libvirt/openshift-cluster/tasks/configure_libvirt_network.yml
+++ /dev/null
@@ -1,11 +0,0 @@
----
-- name: Create the libvirt network for OpenShift
-  virt_net:
-    name: '{{ libvirt_network }}'
-    state: '{{ item }}'
-    autostart: 'yes'
-    xml: "{{ lookup('template', 'network.xml') }}"
-    uri: '{{ libvirt_uri }}'
-  with_items:
-    - present
-    - active
diff --git a/playbooks/libvirt/openshift-cluster/tasks/configure_libvirt_storage_pool.yml b/playbooks/libvirt/openshift-cluster/tasks/configure_libvirt_storage_pool.yml
deleted file mode 100644
index 8685624ec..000000000
--- a/playbooks/libvirt/openshift-cluster/tasks/configure_libvirt_storage_pool.yml
+++ /dev/null
@@ -1,30 +0,0 @@
----
-- name: Create libvirt storage directory for openshift
-  file:
-    dest: "{{ libvirt_storage_pool_path }}"
-    state: directory
-
-# We need to set permissions on the directory and any items created under the directory, so we need to call the acl module with and without default set.
-- acl:
-    default: '{{ item.default }}'
-    entity: kvm
-    etype: group
-    name: "{{ libvirt_storage_pool_path }}"
-    permissions: '{{ item.permissions }}'
-    state: present
-  with_items:
-    - default: no
-      permissions: x
-    - default: yes
-      permissions: rwx
-
-- name: Create the libvirt storage pool for OpenShift
-  virt_pool:
-    name: '{{ libvirt_storage_pool }}'
-    state: '{{ item }}'
-    autostart: 'yes'
-    xml: "{{ lookup('template', 'storage-pool.xml') }}"
-    uri: '{{ libvirt_uri }}'
-  with_items:
-    - present
-    - active
diff --git a/playbooks/libvirt/openshift-cluster/tasks/launch_instances.yml b/playbooks/libvirt/openshift-cluster/tasks/launch_instances.yml
deleted file mode 100644
index 4df86effa..000000000
--- a/playbooks/libvirt/openshift-cluster/tasks/launch_instances.yml
+++ /dev/null
@@ -1,142 +0,0 @@
----
-# TODO: Add support for choosing base image based on deployment_type and os
-# wanted (os wanted needs support added in bin/cluster with sane defaults:
-# fedora/centos for origin, rhel for enterprise)
-
-# TODO: create a role to encapsulate some of this complexity, possibly also
-# create a module to manage the storage tasks, network tasks, and possibly
-# even handle the libvirt tasks to set metadata in the domain xml and be able
-# to create/query data about vms without having to use xml the python libvirt
-# bindings look like a good candidate for this
-
-- name: Download Base Cloud image
-  get_url:
-    url: '{{ image_url }}'
-    sha256sum: '{{ image_sha256 }}'
-    dest: '{{ libvirt_storage_pool_path }}/{{ [image_name, image_compression] | difference([""]) | join(".") }}'
-  when: ( lookup("oo_option", "skip_image_download") | default("no", True) | lower ) in ["false", "no"]
-  register: downloaded_image
-
-- name: Uncompress xz compressed base cloud image
-  command: 'unxz -kf {{ libvirt_storage_pool_path }}/{{ [image_name, image_compression] | join(".") }}'
-  args:
-    creates: '{{ libvirt_storage_pool_path }}/{{ image_name }}'
-  when: image_compression in ["xz"] and downloaded_image.changed
-
-- name: Uncompress tgz compressed base cloud image
-  command: 'tar zxvf {{ libvirt_storage_pool_path }}/{{ [image_name, image_compression] | join(".") }}'
-  args:
-    creates: '{{ libvirt_storage_pool_path }}/{{ image_name }}'
-  when: image_compression in ["tgz"] and downloaded_image.changed
-
-- name: Uncompress gzip compressed base cloud image
-  command: 'gunzip {{ libvirt_storage_pool_path }}/{{ [image_name, image_compression] | join(".") }}'
-  args:
-    creates: '{{ libvirt_storage_pool_path }}/{{ image_name }}'
-  when: image_compression in ["gz"] and downloaded_image.changed
-
-- name: Create the cloud-init config drive path
-  file:
-    dest: '{{ libvirt_storage_pool_path }}/{{ item }}_configdrive/'
-    state: directory
-  with_items: '{{ instances }}'
-
-- name: Create the cloud-init config drive files
-  template:
-    src: '{{ item[1] }}'
-    dest: '{{ libvirt_storage_pool_path }}/{{ item[0] }}_configdrive/{{ item[1] }}'
-  with_nested:
-    - '{{ instances }}'
-    - [ user-data, meta-data ]
-
-- name: Check for genisoimage
-  command: which genisoimage
-  register: which_genisoimage
-
-- name: Create the cloud-init config drive
-  command: "{{ 'genisoimage' if which_genisoimage.rc == 0 else 'mkisofs' }} -output {{ libvirt_storage_pool_path }}/{{ item }}_cloud-init.iso -volid cidata -joliet -rock user-data meta-data"
-  args:
-    chdir: "{{ libvirt_storage_pool_path }}/{{ item }}_configdrive/"
-    creates: "{{ libvirt_storage_pool_path }}/{{ item }}_cloud-init.iso"
-  with_items: '{{ instances }}'
-
-- name: Refresh the libvirt storage pool for openshift
-  command: 'virsh -c {{ libvirt_uri }} pool-refresh {{ libvirt_storage_pool }}'
-
-- name: Create VM drives
-  command: 'virsh -c {{ libvirt_uri }} vol-create-as {{ libvirt_storage_pool }} {{ item }}.qcow2 10G --format qcow2 --backing-vol {{ image_name }} --backing-vol-format qcow2'
-  with_items: '{{ instances }}'
-
-- name: Create VM docker drives
-  command: 'virsh -c {{ libvirt_uri }} vol-create-as {{ libvirt_storage_pool }} {{ item }}-docker.qcow2 10G --format qcow2 --allocation 0'
-  with_items: '{{ instances }}'
-
-- name: Create VMs
-  virt:
-    name: '{{ item }}'
-    command: define
-    xml: "{{ lookup('template', '../templates/domain.xml') }}"
-    uri: '{{ libvirt_uri }}'
-  with_items: '{{ instances }}'
-
-- name: Start VMs
-  virt:
-    name: '{{ item }}'
-    state: running
-    uri: '{{ libvirt_uri }}'
-  with_items: '{{ instances }}'
-
-- name: Wait for the VMs to get an IP
-  shell: 'virsh -c {{ libvirt_uri }} net-dhcp-leases {{ libvirt_network }} | egrep -c ''{{ instances | join("|") }}'''
-  register: nb_allocated_ips
-  until: nb_allocated_ips.stdout == '{{ instances | length }}'
-  retries: 60
-  delay: 3
-  when: instances | length != 0
-
-- name: Collect IP addresses of the VMs
-  shell: 'virsh -c {{ libvirt_uri }} net-dhcp-leases {{ libvirt_network }} | awk ''$6 == "{{ item }}" {gsub(/\/.*/, "", $5); print $5}'''
-  register: scratch_ip
-  with_items: '{{ instances }}'
-
-- set_fact:
-    ips: "{{ scratch_ip.results | default([]) | oo_collect('stdout') }}"
-
-- set_fact:
-    node_label:
-      type: "{{ g_sub_host_type }}"
-  when: instances | length > 0 and type == "node"
-
-- set_fact:
-    node_label:
-      type: "{{ type }}"
-  when: instances | length > 0 and type != "node"
-
-- name: Add new instances
-  add_host:
-    hostname: '{{ item.0 }}'
-    ansible_ssh_host: '{{ item.1 }}'
-    ansible_ssh_user: "{{ deployment_vars[deployment_type].ssh_user }}"
-    ansible_become: "{{ deployment_vars[deployment_type].become }}"
-    groups: "tag_environment-{{ cluster_env }}, tag_host-type-{{ type }}, tag_sub-host-type-{{ g_sub_host_type }}, tag_clusterid-{{ cluster_id }}"
-    openshift_node_labels: "{{ node_label }}"
-    libvirt_ip_address: "{{ item.1 }}"
-  with_together:
-    - '{{ instances }}'
-    - '{{ ips }}'
-
-- name: Wait for ssh
-  wait_for:
-    host: '{{ item }}'
-    port: 22
-  with_items: '{{ ips }}'
-
-- name: Wait for openshift user setup
-  command: 'ssh -o StrictHostKeyChecking=no -o PasswordAuthentication=no -o ConnectTimeout=10 -o UserKnownHostsFile=/dev/null openshift@{{ item.1 }} echo openshift user is setup'
-  register: result
-  until: result.rc == 0
-  retries: 30
-  delay: 1
-  with_together:
-    - '{{ instances }}'
-    - '{{ ips }}'
diff --git a/playbooks/libvirt/openshift-cluster/templates/domain.xml b/playbooks/libvirt/openshift-cluster/templates/domain.xml
deleted file mode 100644
index 88504a5f6..000000000
--- a/playbooks/libvirt/openshift-cluster/templates/domain.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<domain type='kvm' id='8'>
-  <name>{{ item }}</name>
-  <memory unit='MiB'>{{ libvirt_instance_memory_mib }}</memory>
-  <metadata xmlns:ansible="https://github.com/ansible/ansible">
-    <ansible:tags>
-      <ansible:tag>environment-{{ cluster_env }}</ansible:tag>
-      <ansible:tag>clusterid-{{ cluster }}</ansible:tag>
-      <ansible:tag>host-type-{{ type }}</ansible:tag>
-      <ansible:tag>sub-host-type-{{ g_sub_host_type }}</ansible:tag>
-    </ansible:tags>
-  </metadata>
-  <vcpu placement='static'>{{ libvirt_instance_vcpu }}</vcpu>
-  <os>
-    <type arch='x86_64' machine='pc'>hvm</type>
-    <boot dev='hd'/>
-  </os>
-  <features>
-    <acpi/>
-    <apic/>
-    <pae/>
-  </features>
-  <cpu mode='host-model'>
-    <model fallback='allow'/>
-  </cpu>
-  <clock offset='utc'>
-    <timer name='rtc' tickpolicy='catchup'/>
-    <timer name='pit' tickpolicy='delay'/>
-    <timer name='hpet' present='no'/>
-  </clock>
-  <on_poweroff>destroy</on_poweroff>
-  <on_reboot>restart</on_reboot>
-  <on_crash>restart</on_crash>
-  <devices>
-    <emulator>/usr/bin/qemu-system-x86_64</emulator>
-    <disk type='file' device='disk'>
-      <driver name='qemu' type='qcow2' discard='unmap'/>
-      <source file='{{ libvirt_storage_pool_path }}/{{ item }}.qcow2'/>
-      <target dev='sda' bus='scsi'/>
-    </disk>
-    <disk type='file' device='disk'>
-      <driver name='qemu' type='qcow2' discard='unmap'/>
-      <source file='{{ libvirt_storage_pool_path }}/{{ item }}-docker.qcow2'/>
-      <target dev='sdb' bus='scsi'/>
-    </disk>
-    <disk type='file' device='cdrom'>
-      <driver name='qemu' type='raw'/>
-      <source file='{{ libvirt_storage_pool_path }}/{{ item }}_cloud-init.iso'/>
-      <target dev='sdc' bus='scsi'/>
-      <readonly/>
-    </disk>
-    <controller type='scsi' model='virtio-scsi' />
-    <interface type='network'>
-      <source network='{{ libvirt_network }}'/>
-      <model type='virtio'/>
-    </interface>
-    <serial type='pty'>
-      <target port='0'/>
-    </serial>
-    <console type='pty'>
-      <target type='serial' port='0'/>
-    </console>
-    <memballoon model='virtio'>
-    </memballoon>
-  </devices>
-</domain>
diff --git a/playbooks/libvirt/openshift-cluster/templates/meta-data b/playbooks/libvirt/openshift-cluster/templates/meta-data
deleted file mode 100644
index 6b421770d..000000000
--- a/playbooks/libvirt/openshift-cluster/templates/meta-data
+++ /dev/null
@@ -1,3 +0,0 @@
-instance-id: {{ item[0] }}
-hostname: {{ item[0] }}
-local-hostname: {{ item[0] }}.example.com
diff --git a/playbooks/libvirt/openshift-cluster/templates/network.xml b/playbooks/libvirt/openshift-cluster/templates/network.xml
deleted file mode 100644
index 0ce2a8342..000000000
--- a/playbooks/libvirt/openshift-cluster/templates/network.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<network>
-  <name>{{ libvirt_network }}</name>
-  <forward mode='nat'>
-    <nat>
-      <port start='1024' end='65535'/>
-    </nat>
-  </forward>
-  <!-- TODO: query for first available virbr interface available -->
-  <bridge name='virbr3' stp='on' delay='0'/>
-  <!-- TODO: make overridable -->
-  <domain name='example.com' localOnly='yes' />
-  <dns>
-    <!-- TODO: automatically add host entries -->
-  </dns>
-  <!-- TODO: query for available address space -->
-  <ip address='192.168.55.1' netmask='255.255.255.0'>
-    <dhcp>
-      <range start='192.168.55.2' end='192.168.55.254'/>
-      <!-- TODO: add static entries addresses for the hosts to be created -->
-    </dhcp>
-  </ip>
-</network>
-
diff --git a/playbooks/libvirt/openshift-cluster/templates/storage-pool.xml b/playbooks/libvirt/openshift-cluster/templates/storage-pool.xml
deleted file mode 100644
index da139afd0..000000000
--- a/playbooks/libvirt/openshift-cluster/templates/storage-pool.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<pool type='dir'>
-  <name>{{ libvirt_storage_pool }}</name>
-  <target>
-    <path>{{ libvirt_storage_pool_path }}</path>
-  </target>
-</pool>
diff --git a/playbooks/libvirt/openshift-cluster/templates/user-data b/playbooks/libvirt/openshift-cluster/templates/user-data
deleted file mode 100644
index fbcf7c886..000000000
--- a/playbooks/libvirt/openshift-cluster/templates/user-data
+++ /dev/null
@@ -1,43 +0,0 @@
-#cloud-config
-disable_root: true
-
-hostname: {{ item[0] }}
-fqdn: {{ item[0] }}.example.com
-
-mounts:
-- [ sdb ]
-
-users:
-  - default
-  - name: root
-    ssh_authorized_keys:
-    - {{ lookup('file', '~/.ssh/id_rsa.pub') }}
-
-system_info:
-  default_user:
-    name: openshift
-    sudo: ["ALL=(ALL) NOPASSWD: ALL"]
-
-ssh_authorized_keys:
-  - {{ lookup('file', '~/.ssh/id_rsa.pub') }}
-
-write_files:
-  - path: /etc/sudoers.d/00-openshift-no-requiretty
-    permissions: 440
-    content: |
-        Defaults:openshift !requiretty
-  - path: /etc/sysconfig/docker-storage-setup
-    owner: root:root
-    permissions: '0644'
-    content: |
-      DEVS=/dev/sdb
-      VG=docker_vg
-      EXTRA_DOCKER_STORAGE_OPTIONS='--storage-opt dm.blkdiscard=true'
-  - path: /etc/systemd/system/fstrim.timer.d/hourly.conf
-    content: |
-      [Timer]
-      OnCalendar=hourly
-
-runcmd:
-  - NETWORK_CONFIG=/etc/sysconfig/network-scripts/ifcfg-eth0; if ! grep DHCP_HOSTNAME ${NETWORK_CONFIG}; then echo 'DHCP_HOSTNAME="{{ item[0] }}.example.com"' >> ${NETWORK_CONFIG}; fi; pkill -9 dhclient; service network restart
-  - systemctl enable --now fstrim.timer
diff --git a/playbooks/libvirt/openshift-cluster/terminate.yml b/playbooks/libvirt/openshift-cluster/terminate.yml
deleted file mode 100644
index 8a63d11a5..000000000
--- a/playbooks/libvirt/openshift-cluster/terminate.yml
+++ /dev/null
@@ -1,70 +0,0 @@
----
-# TODO: does not handle a non-existent cluster gracefully
-
-- name: Terminate instance(s)
-  hosts: localhost
-  become: no
-  connection: local
-  gather_facts: no
-  vars_files:
-  - vars.yml
-  tasks:
-  - set_fact: cluster_group=tag_clusterid-{{ cluster_id }}
-  - add_host:
-      name: "{{ item }}"
-      groups: oo_hosts_to_terminate
-      ansible_ssh_user: "{{ deployment_vars[deployment_type].ssh_user }}"
-      ansible_become: "{{ deployment_vars[deployment_type].become }}"
-    with_items: '{{ groups[cluster_group] | default([]) }}'
-
-- name: Unsubscribe VMs
-  hosts: oo_hosts_to_terminate
-  vars_files:
-  - vars.yml
-  roles:
-  - role: rhel_unsubscribe
-    when: deployment_type in ['atomic-enterprise', 'enterprise', 'openshift-enterprise'] and
-          ansible_distribution == "RedHat" and
-          lookup('oo_option', 'rhel_skip_subscription') | default(rhsub_skip, True) |
-            default('no', True) | lower in ['no', 'false']
-
-- name: Terminate instance(s)
-  hosts: localhost
-  become: no
-  connection: local
-  gather_facts: no
-  vars_files:
-  - vars.yml
-  tasks:
-  - name: Destroy VMs
-    virt:
-      name: '{{ item[0] }}'
-      command: '{{ item[1] }}'
-      uri: '{{ libvirt_uri }}'
-    with_nested:
-    - "{{ groups['oo_hosts_to_terminate'] }}"
-    - [ destroy, undefine ]
-
-  - name: Delete VM drives
-    command: 'virsh -c {{ libvirt_uri }} vol-delete --pool {{ libvirt_storage_pool }} {{ item }}.qcow2'
-    args:
-      removes: '{{ libvirt_storage_pool_path }}/{{ item }}.qcow2'
-    with_items: "{{ groups['oo_hosts_to_terminate'] }}"
-
-  - name: Delete VM docker drives
-    command: 'virsh -c {{ libvirt_uri }} vol-delete --pool {{ libvirt_storage_pool }} {{ item }}-docker.qcow2'
-    args:
-      removes: '{{ libvirt_storage_pool_path }}/{{ item }}-docker.qcow2'
-    with_items: "{{ groups['oo_hosts_to_terminate'] }}"
-
-  - name: Delete the VM cloud-init image
-    file:
-      path: '{{ libvirt_storage_pool_path }}/{{ item }}_cloud-init.iso'
-      state: absent
-    with_items: "{{ groups['oo_hosts_to_terminate'] }}"
-
-  - name: Remove the cloud-init config directory
-    file:
-      path: '{{ libvirt_storage_pool_path }}/{{ item }}_configdrive/'
-      state: absent
-    with_items: "{{ groups['oo_hosts_to_terminate'] }}"
diff --git a/playbooks/libvirt/openshift-cluster/update.yml b/playbooks/libvirt/openshift-cluster/update.yml
deleted file mode 100644
index a152135fc..000000000
--- a/playbooks/libvirt/openshift-cluster/update.yml
+++ /dev/null
@@ -1,37 +0,0 @@
----
-- hosts: localhost
-  gather_facts: no
-  tasks:
-  - include_vars: vars.yml
-  - include_vars: cluster_hosts.yml
-  - add_host:
-      name: "{{ item }}"
-      groups: l_oo_all_hosts
-    with_items: '{{ g_all_hosts }}'
-
-- hosts: l_oo_all_hosts
-  gather_facts: no
-  tasks:
-  - include_vars: vars.yml
-  - include_vars: cluster_hosts.yml
-
-- name: Populate oo_hosts_to_update group
-  hosts: localhost
-  connection: local
-  become: no
-  gather_facts: no
-  vars_files:
-  - vars.yml
-  - cluster_hosts.yml
-  tasks:
-  - name: Evaluate oo_hosts_to_update
-    add_host:
-      name: "{{ item }}"
-      groups: oo_hosts_to_update
-      ansible_ssh_user: "{{ deployment_vars[deployment_type].ssh_user }}"
-      ansible_become: "{{ deployment_vars[deployment_type].become }}"
-    with_items: '{{ g_all_hosts | default([]) }}'
-
-- include: ../../common/openshift-cluster/update_repos_and_packages.yml
-
-- include: config.yml
diff --git a/playbooks/libvirt/openshift-cluster/vars.yml b/playbooks/libvirt/openshift-cluster/vars.yml
deleted file mode 100644
index 5156789e7..000000000
--- a/playbooks/libvirt/openshift-cluster/vars.yml
+++ /dev/null
@@ -1,40 +0,0 @@
----
-default_pool_path: "{{ lookup('env','HOME') }}/libvirt-storage-pool-openshift-ansible"
-libvirt_storage_pool_path: "{{ lookup('oo_option', 'libvirt_storage_pool_path') | default(default_pool_path, True) }}"
-libvirt_storage_pool: "{{ lookup('oo_option', 'libvirt_storage_pool') | default('openshift-ansible', True) }}"
-libvirt_network: "{{ lookup('oo_option', 'libvirt_network') | default('openshift-ansible', True) }}"
-libvirt_instance_memory_mib: "{{ lookup('oo_option', 'libvirt_instance_memory_mib') | default(1024, True) }}"
-libvirt_instance_vcpu: "{{ lookup('oo_option', 'libvirt_instance_vcpu') | default(2, True) }}"
-libvirt_uri: "{{ lookup('oo_option', 'libvirt_uri') | default('qemu:///system', True) }}"
-debug_level: 2
-
-# Automatic download of the qcow2 image for RHEL cannot be done directly from the RedHat portal because it requires authentication.
-# The default value of image_url for enterprise and openshift-enterprise deployment types below won't work.
-deployment_rhel7_ent_base:
-  image:
-    url: "{{ lookup('oo_option', 'image_url') |
-             default('https://access.cdn.redhat.com//content/origin/files/sha256/25/25f880767ec6bf71beb532e17f1c45231640bbfdfbbb1dffb79d2c1b328388e0/rhel-guest-image-7.2-20151102.0.x86_64.qcow2', True) }}"
-    name: "{{ lookup('oo_option', 'image_name') |
-              default('rhel-guest-image-7.2-20151102.0.x86_64.qcow2', True) }}"
-    sha256: "{{ lookup('oo_option', 'image_sha256') |
-                default('25f880767ec6bf71beb532e17f1c45231640bbfdfbbb1dffb79d2c1b328388e0', True) }}"
-    compression: ""
-  ssh_user: openshift
-  become: yes
-
-deployment_vars:
-  origin:
-    image:
-      url: "{{ lookup('oo_option', 'image_url') |
-               default('http://cloud.centos.org/centos/7/images/CentOS-7-x86_64-GenericCloud-1602.qcow2.xz', True) }}"
-      compression: "{{ lookup('oo_option', 'image_compression') |
-                       default('xz', True) }}"
-      name: "{{ lookup('oo_option', 'image_name') |
-                default('CentOS-7-x86_64-GenericCloud.qcow2', True) }}"
-      sha256: "{{ lookup('oo_option', 'image_sha256') |
-                  default('dd0f5e610e7c5ffacaca35ed7a78a19142a588f4543da77b61c1fb0d74400471', True) }}"
-    ssh_user: openshift
-    become: yes
-  enterprise: "{{ deployment_rhel7_ent_base }}"
-  openshift-enterprise: "{{ deployment_rhel7_ent_base }}"
-  atomic-enterprise: "{{ deployment_rhel7_ent_base }}"
diff --git a/playbooks/openstack/README.md b/playbooks/openstack/README.md
deleted file mode 100644
index a6d8d6995..000000000
--- a/playbooks/openstack/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-# OpenStack playbooks
-
-This playbook directory is meant to be driven by [`bin/cluster`](../../bin),
-which is community supported and most use is considered deprecated.
diff --git a/playbooks/openstack/openshift-cluster/cluster_hosts.yml b/playbooks/openstack/openshift-cluster/cluster_hosts.yml
deleted file mode 100644
index 12c9fd442..000000000
--- a/playbooks/openstack/openshift-cluster/cluster_hosts.yml
+++ /dev/null
@@ -1,25 +0,0 @@
----
-g_all_hosts: "{{ groups['meta-clusterid_' ~ cluster_id] | default([])
-                 | intersect(groups['meta-environment_' ~ cluster_env] | default([])) }}"
-
-g_etcd_hosts: "{{ g_all_hosts | intersect(groups['meta-host-type_etcd'] | default([])) }}"
-
-g_new_etcd_hosts: "{{ g_all_hosts | intersect(groups['meta-host-type_new_etcd'] | default([])) }}"
-
-g_lb_hosts: "{{ g_all_hosts | intersect(groups['meta-host-type_lb'] | default([])) }}"
-
-g_nfs_hosts: "{{ g_all_hosts | intersect(groups['meta-host-type_nfs'] | default([])) }}"
-
-g_glusterfs_hosts: "{{ g_all_hosts | intersect(groups['tag_host-type-glusterfs'] | default([])) }}"
-
-g_master_hosts: "{{ g_all_hosts | intersect(groups['meta-host-type_master'] | default([])) }}"
-
-g_new_master_hosts: "{{ g_all_hosts | intersect(groups['meta-host-type_new_master'] | default([])) }}"
-
-g_node_hosts: "{{ g_all_hosts | intersect(groups['meta-host-type_node'] | default([])) }}"
-
-g_new_node_hosts: "{{ g_all_hosts | intersect(groups['meta-host-type_new_node'] | default([])) }}"
-
-g_infra_hosts: "{{ g_node_hosts | intersect(groups['meta-sub-host-type_infra'] | default([])) }}"
-
-g_compute_hosts: "{{ g_node_hosts | intersect(groups['meta-sub-host-type_compute'] | default([])) }}"
diff --git a/playbooks/openstack/openshift-cluster/config.yml b/playbooks/openstack/openshift-cluster/config.yml
deleted file mode 100644
index f9ddb9469..000000000
--- a/playbooks/openstack/openshift-cluster/config.yml
+++ /dev/null
@@ -1,33 +0,0 @@
----
-- hosts: localhost
-  gather_facts: no
-  tasks:
-  - include_vars: vars.yml
-  - include_vars: cluster_hosts.yml
-  - add_host:
-      name: "{{ item }}"
-      groups: l_oo_all_hosts
-    with_items: "{{ g_all_hosts | default([]) }}"
-
-- hosts: l_oo_all_hosts
-  gather_facts: no
-  tasks:
-  - include_vars: vars.yml
-  - include_vars: cluster_hosts.yml
-
-- include: ../../common/openshift-cluster/config.yml
-  vars:
-    g_nodeonmaster: true
-    g_ssh_user: "{{ deployment_vars[deployment_type].ssh_user }}"
-    g_sudo: "{{ deployment_vars[deployment_type].become }}"
-    openshift_cluster_id: "{{ cluster_id }}"
-    openshift_debug_level: "{{ debug_level }}"
-    openshift_deployment_type: "{{ deployment_type }}"
-    openshift_hosted_registry_selector: 'type=infra'
-    openshift_hosted_router_selector: 'type=infra'
-    openshift_master_cluster_method: 'native'
-    openshift_use_openshift_sdn: "{{ lookup('oo_option', 'use_openshift_sdn') }}"
-    os_sdn_network_plugin_name: "{{ lookup('oo_option', 'sdn_network_plugin_name') }}"
-    openshift_use_flannel: "{{ lookup('oo_option', 'use_flannel') }}"
-    openshift_use_calico: "{{ lookup('oo_option', 'use_calico') }}"
-    openshift_use_fluentd: "{{ lookup('oo_option', 'use_fluentd') }}"
diff --git a/playbooks/openstack/openshift-cluster/files/heat_stack.yaml b/playbooks/openstack/openshift-cluster/files/heat_stack.yaml
deleted file mode 100644
index 82329eac1..000000000
--- a/playbooks/openstack/openshift-cluster/files/heat_stack.yaml
+++ /dev/null
@@ -1,508 +0,0 @@
-heat_template_version: 2014-10-16
-
-description: OpenShift cluster
-
-parameters:
-
-  cluster_env:
-    type: string
-    label: Cluster environment
-    description: Environment of the cluster
-
-  cluster_id:
-    type: string
-    label: Cluster ID
-    description: Identifier of the cluster
-
-  subnet_24_prefix:
-    type: string
-    label: subnet /24 prefix
-    description: /24 subnet prefix of the network of the cluster (dot separated number triplet)
-
-  dns_nameservers:
-    type: comma_delimited_list
-    label: DNS nameservers list
-    description: List of DNS nameservers
-
-  external_net:
-    type: string
-    label: External network
-    description: Name of the external network
-    default: external
-
-  ssh_public_key:
-    type: string
-    label: SSH public key
-    description: SSH public key
-    hidden: true
-
-  ssh_incoming:
-    type: string
-    label: Source of ssh connections
-    description: Source of legitimate ssh connections
-    default: 0.0.0.0/0
-
-  node_port_incoming:
-    type: string
-    label: Source of node port connections
-    description: Authorized sources targeting node ports
-    default: 0.0.0.0/0
-
-  num_etcd:
-    type: number
-    label: Number of etcd nodes
-    description: Number of etcd nodes
-
-  num_masters:
-    type: number
-    label: Number of masters
-    description: Number of masters
-
-  num_nodes:
-    type: number
-    label: Number of compute nodes
-    description: Number of compute nodes
-
-  num_infra:
-    type: number
-    label: Number of infrastructure nodes
-    description: Number of infrastructure nodes
-
-  etcd_image:
-    type: string
-    label: Etcd image
-    description: Name of the image for the etcd servers
-
-  master_image:
-    type: string
-    label: Master image
-    description: Name of the image for the master servers
-
-  node_image:
-    type: string
-    label: Node image
-    description: Name of the image for the compute node servers
-
-  infra_image:
-    type: string
-    label: Infra image
-    description: Name of the image for the infra node servers
-
-  etcd_flavor:
-    type: string
-    label: Etcd flavor
-    description: Flavor of the etcd servers
-
-  master_flavor:
-    type: string
-    label: Master flavor
-    description: Flavor of the master servers
-
-  node_flavor:
-    type: string
-    label: Node flavor
-    description: Flavor of the compute node servers
-
-  infra_flavor:
-    type: string
-    label: Infra flavor
-    description: Flavor of the infra node servers
-
-outputs:
-
-  etcd_names:
-    description: Name of the etcds
-    value: { get_attr: [ etcd, name ] }
-
-  etcd_ips:
-    description: IPs of the etcds
-    value: { get_attr: [ etcd, private_ip ] }
-
-  etcd_floating_ips:
-    description: Floating IPs of the etcds
-    value: { get_attr: [ etcd, floating_ip ] }
-
-  master_names:
-    description: Name of the masters
-    value: { get_attr: [ masters, name ] }
-
-  master_ips:
-    description: IPs of the masters
-    value: { get_attr: [ masters, private_ip ] }
-
-  master_floating_ips:
-    description: Floating IPs of the masters
-    value: { get_attr: [ masters, floating_ip ] }
-
-  node_names:
-    description: Name of the nodes
-    value: { get_attr: [ compute_nodes, name ] }
-
-  node_ips:
-    description: IPs of the nodes
-    value: { get_attr: [ compute_nodes, private_ip ] }
-
-  node_floating_ips:
-    description: Floating IPs of the nodes
-    value: { get_attr: [ compute_nodes, floating_ip ] }
-
-  infra_names:
-    description: Name of the nodes
-    value: { get_attr: [ infra_nodes, name ] }
-
-  infra_ips:
-    description: IPs of the nodes
-    value: { get_attr: [ infra_nodes, private_ip ] }
-
-  infra_floating_ips:
-    description: Floating IPs of the nodes
-    value: { get_attr: [ infra_nodes, floating_ip ] }
-
-resources:
-
-  net:
-    type: OS::Neutron::Net
-    properties:
-      name:
-        str_replace:
-          template: openshift-ansible-cluster_id-net
-          params:
-            cluster_id: { get_param: cluster_id }
-
-  subnet:
-    type: OS::Neutron::Subnet
-    properties:
-      name:
-        str_replace:
-          template: openshift-ansible-cluster_id-subnet
-          params:
-            cluster_id: { get_param: cluster_id }
-      network: { get_resource: net }
-      cidr:
-        str_replace:
-          template: subnet_24_prefix.0/24
-          params:
-            subnet_24_prefix: { get_param: subnet_24_prefix }
-      dns_nameservers: { get_param: dns_nameservers }
-
-  router:
-    type: OS::Neutron::Router
-    properties:
-      name:
-        str_replace:
-          template: openshift-ansible-cluster_id-router
-          params:
-            cluster_id: { get_param: cluster_id }
-      external_gateway_info:
-        network: { get_param: external_net }
-
-  interface:
-    type: OS::Neutron::RouterInterface
-    properties:
-      router_id: { get_resource: router }
-      subnet_id: { get_resource: subnet }
-
-  keypair:
-    type: OS::Nova::KeyPair
-    properties:
-      name:
-        str_replace:
-          template: openshift-ansible-cluster_id-keypair
-          params:
-            cluster_id: { get_param: cluster_id }
-      public_key: { get_param: ssh_public_key }
-
-  master-secgrp:
-    type: OS::Neutron::SecurityGroup
-    properties:
-      name:
-        str_replace:
-          template: openshift-ansible-cluster_id-master-secgrp
-          params:
-            cluster_id: { get_param: cluster_id }
-      description:
-        str_replace:
-          template: Security group for cluster_id OpenShift cluster master
-          params:
-            cluster_id: { get_param: cluster_id }
-      rules:
-        - direction: ingress
-          protocol: tcp
-          port_range_min: 22
-          port_range_max: 22
-          remote_ip_prefix: { get_param: ssh_incoming }
-        - direction: ingress
-          protocol: tcp
-          port_range_min: 4001
-          port_range_max: 4001
-        - direction: ingress
-          protocol: tcp
-          port_range_min: 8443
-          port_range_max: 8443
-        - direction: ingress
-          protocol: tcp
-          port_range_min: 8444
-          port_range_max: 8444
-        - direction: ingress
-          protocol: tcp
-          port_range_min: 53
-          port_range_max: 53
-        - direction: ingress
-          protocol: udp
-          port_range_min: 53
-          port_range_max: 53
-        - direction: ingress
-          protocol: tcp
-          port_range_min: 8053
-          port_range_max: 8053
-        - direction: ingress
-          protocol: udp
-          port_range_min: 8053
-          port_range_max: 8053
-        - direction: ingress
-          protocol: tcp
-          port_range_min: 24224
-          port_range_max: 24224
-        - direction: ingress
-          protocol: udp
-          port_range_min: 24224
-          port_range_max: 24224
-        - direction: ingress
-          protocol: tcp
-          port_range_min: 2224
-          port_range_max: 2224
-        - direction: ingress
-          protocol: udp
-          port_range_min: 5404
-          port_range_max: 5404
-        - direction: ingress
-          protocol: udp
-          port_range_min: 5405
-          port_range_max: 5405
-        - direction: ingress
-          protocol: tcp
-          port_range_min: 9090
-          port_range_max: 9090
-
-  etcd-secgrp:
-    type: OS::Neutron::SecurityGroup
-    properties:
-      name:
-        str_replace:
-          template: openshift-ansible-cluster_id-etcd-secgrp
-          params:
-            cluster_id: { get_param: cluster_id }
-      description:
-        str_replace:
-          template: Security group for cluster_id etcd cluster
-          params:
-            cluster_id: { get_param: cluster_id }
-      rules:
-        - direction: ingress
-          protocol: tcp
-          port_range_min: 22
-          port_range_max: 22
-          remote_ip_prefix: { get_param: ssh_incoming }
-        - direction: ingress
-          protocol: tcp
-          port_range_min: 2379
-          port_range_max: 2379
-          remote_mode: remote_group_id
-          remote_group_id: { get_resource: master-secgrp }
-        - direction: ingress
-          protocol: tcp
-          port_range_min: 2380
-          port_range_max: 2380
-          remote_mode: remote_group_id
-
-  node-secgrp:
-    type: OS::Neutron::SecurityGroup
-    properties:
-      name:
-        str_replace:
-          template: openshift-ansible-cluster_id-node-secgrp
-          params:
-            cluster_id: { get_param: cluster_id }
-      description:
-        str_replace:
-          template: Security group for cluster_id OpenShift cluster nodes
-          params:
-            cluster_id: { get_param: cluster_id }
-      rules:
-        - direction: ingress
-          protocol: tcp
-          port_range_min: 22
-          port_range_max: 22
-          remote_ip_prefix: { get_param: ssh_incoming }
-        - direction: ingress
-          protocol: tcp
-          port_range_min: 10250
-          port_range_max: 10250
-          remote_mode: remote_group_id
-        - direction: ingress
-          protocol: udp
-          port_range_min: 4789
-          port_range_max: 4789
-          remote_mode: remote_group_id
-        - direction: ingress
-          protocol: tcp
-          port_range_min: 30000
-          port_range_max: 32767
-          remote_ip_prefix: { get_param: node_port_incoming }
-
-  infra-secgrp:
-    type: OS::Neutron::SecurityGroup
-    properties:
-      name:
-        str_replace:
-          template: openshift-ansible-cluster_id-infra-secgrp
-          params:
-            cluster_id: { get_param: cluster_id }
-      description:
-        str_replace:
-          template: Security group for cluster_id OpenShift infrastructure cluster nodes
-          params:
-            cluster_id: { get_param: cluster_id }
-      rules:
-        - direction: ingress
-          protocol: tcp
-          port_range_min: 80
-          port_range_max: 80
-        - direction: ingress
-          protocol: tcp
-          port_range_min: 443
-          port_range_max: 443
-
-  etcd:
-    type: OS::Heat::ResourceGroup
-    properties:
-      count: { get_param: num_etcd }
-      resource_def:
-        type: heat_stack_server.yaml
-        properties:
-          name:
-            str_replace:
-              template: cluster_id-k8s_type-%index%
-              params:
-                cluster_id: { get_param: cluster_id }
-                k8s_type: etcd
-          cluster_env: { get_param: cluster_env }
-          cluster_id:  { get_param: cluster_id }
-          type:        etcd
-          image:       { get_param: etcd_image }
-          flavor:      { get_param: etcd_flavor }
-          key_name:    { get_resource: keypair }
-          net:         { get_resource: net }
-          subnet:      { get_resource: subnet }
-          secgrp:
-            - { get_resource: etcd-secgrp }
-          floating_network: { get_param: external_net }
-          net_name:
-            str_replace:
-              template: openshift-ansible-cluster_id-net
-              params:
-                cluster_id: { get_param: cluster_id }
-    depends_on:
-      - interface
-
-  masters:
-    type: OS::Heat::ResourceGroup
-    properties:
-      count: { get_param: num_masters }
-      resource_def:
-        type: heat_stack_server.yaml
-        properties:
-          name:
-            str_replace:
-              template: cluster_id-k8s_type-%index%
-              params:
-                cluster_id: { get_param: cluster_id }
-                k8s_type: master
-          cluster_env: { get_param: cluster_env }
-          cluster_id:  { get_param: cluster_id }
-          type:        master
-          image:       { get_param: master_image }
-          flavor:      { get_param: master_flavor }
-          key_name:    { get_resource: keypair }
-          net:         { get_resource: net }
-          subnet:      { get_resource: subnet }
-          secgrp:
-            - { get_resource: master-secgrp }
-            - { get_resource: node-secgrp }
-          floating_network: { get_param: external_net }
-          net_name:
-            str_replace:
-              template: openshift-ansible-cluster_id-net
-              params:
-                cluster_id: { get_param: cluster_id }
-    depends_on:
-      - interface
-
-  compute_nodes:
-    type: OS::Heat::ResourceGroup
-    properties:
-      count: { get_param: num_nodes }
-      resource_def:
-        type: heat_stack_server.yaml
-        properties:
-          name:
-            str_replace:
-              template: cluster_id-k8s_type-sub_host_type-%index%
-              params:
-                cluster_id: { get_param: cluster_id }
-                k8s_type: node
-                sub_host_type: compute
-          cluster_env: { get_param: cluster_env }
-          cluster_id:  { get_param: cluster_id }
-          type:        node
-          subtype:     compute
-          image:       { get_param: node_image }
-          flavor:      { get_param: node_flavor }
-          key_name:    { get_resource: keypair }
-          net:         { get_resource: net }
-          subnet:      { get_resource: subnet }
-          secgrp:
-            - { get_resource: node-secgrp }
-          floating_network: { get_param: external_net }
-          net_name:
-            str_replace:
-              template: openshift-ansible-cluster_id-net
-              params:
-                cluster_id: { get_param: cluster_id }
-    depends_on:
-      - interface
-
-  infra_nodes:
-    type: OS::Heat::ResourceGroup
-    properties:
-      count: { get_param: num_infra }
-      resource_def:
-        type: heat_stack_server.yaml
-        properties:
-          name:
-            str_replace:
-              template: cluster_id-k8s_type-sub_host_type-%index%
-              params:
-                cluster_id: { get_param: cluster_id }
-                k8s_type: node
-                sub_host_type: infra
-          cluster_env: { get_param: cluster_env }
-          cluster_id:  { get_param: cluster_id }
-          type:        node
-          subtype:     infra
-          image:       { get_param: infra_image }
-          flavor:      { get_param: infra_flavor }
-          key_name:    { get_resource: keypair }
-          net:         { get_resource: net }
-          subnet:      { get_resource: subnet }
-          secgrp:
-            - { get_resource: node-secgrp }
-            - { get_resource: infra-secgrp }
-          floating_network: { get_param: external_net }
-          net_name:
-            str_replace:
-              template: openshift-ansible-cluster_id-net
-              params:
-                cluster_id: { get_param: cluster_id }
-    depends_on:
-      - interface
diff --git a/playbooks/openstack/openshift-cluster/files/heat_stack_server.yaml b/playbooks/openstack/openshift-cluster/files/heat_stack_server.yaml
deleted file mode 100644
index 435139849..000000000
--- a/playbooks/openstack/openshift-cluster/files/heat_stack_server.yaml
+++ /dev/null
@@ -1,152 +0,0 @@
-heat_template_version: 2014-10-16
-
-description: OpenShift cluster server
-
-parameters:
-
-  name:
-    type: string
-    label: Name
-    description: Name
-
-  cluster_env:
-    type: string
-    label: Cluster environment
-    description: Environment of the cluster
-
-  cluster_id:
-    type: string
-    label: Cluster ID
-    description: Identifier of the cluster
-
-  type:
-    type: string
-    label: Type
-    description: Type master or node
-
-  subtype:
-    type: string
-    label: Sub-type
-    description: Sub-type compute or infra for nodes, default otherwise
-    default: default
-
-  key_name:
-    type: string
-    label: Key name
-    description: Key name of keypair
-
-  image:
-    type: string
-    label: Image
-    description: Name of the image
-
-  flavor:
-    type: string
-    label: Flavor
-    description: Name of the flavor
-
-  net:
-    type: string
-    label: Net ID
-    description: Net resource
-
-  net_name:
-    type: string
-    label: Net name
-    description: Net name
-
-  subnet:
-    type: string
-    label: Subnet ID
-    description: Subnet resource
-
-  secgrp:
-    type: comma_delimited_list
-    label: Security groups
-    description: Security group resources
-
-  floating_network:
-    type: string
-    label: Floating network
-    description: Network to allocate floating IP from
-
-outputs:
-
-  name:
-    description: Name of the server
-    value: { get_attr: [ server, name ] }
-
-  private_ip:
-    description: Private IP of the server
-    value:
-      get_attr:
-        - server
-        - addresses
-        - { get_param: net_name }
-        - 0
-        - addr
-
-  floating_ip:
-    description: Floating IP of the server
-    value:
-      get_attr:
-        - server
-        - addresses
-        - { get_param: net_name }
-        - 1
-        - addr
-
-resources:
-
-  server:
-    type: OS::Nova::Server
-    properties:
-      name:      { get_param: name }
-      key_name:  { get_param: key_name }
-      image:     { get_param: image }
-      flavor:    { get_param: flavor }
-      networks:
-        - port:  { get_resource: port }
-      user_data: { get_resource: config }
-      user_data_format: RAW
-      metadata:
-        environment: { get_param: cluster_env }
-        clusterid: { get_param: cluster_id }
-        host-type: { get_param: type }
-        sub-host-type:    { get_param: subtype }
-
-  port:
-    type: OS::Neutron::Port
-    properties:
-      network: { get_param: net }
-      fixed_ips:
-        - subnet: { get_param: subnet }
-      security_groups: { get_param: secgrp }
-
-  floating-ip:
-    type: OS::Neutron::FloatingIP
-    properties:
-      floating_network: { get_param: floating_network }
-      port_id: { get_resource: port }
-
-  config:
-    type: OS::Heat::CloudConfig
-    properties:
-      cloud_config:
-        disable_root: true
-
-        hostname: { get_param: name }
-
-        system_info:
-          default_user:
-            name: openshift
-            sudo: ["ALL=(ALL) NOPASSWD: ALL"]
-
-        write_files:
-          - path: /etc/sudoers.d/00-openshift-no-requiretty
-            permissions: 440
-            # content: Defaults:openshift !requiretty
-            # Encoded in base64 to be sure that we do not forget the trailing newline or
-            # sudo will not be able to parse that file
-            encoding: b64
-            content: RGVmYXVsdHM6b3BlbnNoaWZ0ICFyZXF1aXJldHR5Cg==
diff --git a/playbooks/openstack/openshift-cluster/filter_plugins b/playbooks/openstack/openshift-cluster/filter_plugins
deleted file mode 120000
index 99a95e4ca..000000000
--- a/playbooks/openstack/openshift-cluster/filter_plugins
+++ /dev/null
@@ -1 +0,0 @@
-../../../filter_plugins
\ No newline at end of file
diff --git a/playbooks/openstack/openshift-cluster/launch.yml b/playbooks/openstack/openshift-cluster/launch.yml
deleted file mode 100644
index c0bc12f55..000000000
--- a/playbooks/openstack/openshift-cluster/launch.yml
+++ /dev/null
@@ -1,191 +0,0 @@
----
-- name: Launch instance(s)
-  hosts: localhost
-  become: no
-  connection: local
-  gather_facts: no
-  vars_files:
-  - vars.yml
-  tasks:
-  # TODO: Write an Ansible module for dealing with HEAT stacks
-  #       Dealing with the outputs is currently terrible
-
-  - name: Check OpenStack stack
-    command: 'heat stack-show openshift-ansible-{{ cluster_id }}-stack'
-    register: stack_show_result
-    changed_when: false
-    failed_when: stack_show_result.rc != 0 and 'Stack not found' not in stack_show_result.stderr
-
-  - set_fact:
-      heat_stack_action: 'stack-create'
-    when: stack_show_result.rc == 1
-  - set_fact:
-      heat_stack_action: 'stack-update'
-    when: stack_show_result.rc == 0
-
-  - name: Create or Update OpenStack Stack
-    command: 'heat {{ heat_stack_action }} -f {{ openstack_infra_heat_stack }}
-             --timeout {{ openstack_heat_timeout }}
-             -P cluster_env={{ cluster_env }}
-             -P cluster_id={{ cluster_id }}
-             -P subnet_24_prefix={{ openstack_subnet_24_prefix }}
-             -P dns_nameservers={{ openstack_network_dns | join(",") }}
-             -P external_net={{ openstack_network_external_net }}
-             -P ssh_public_key="{{ openstack_ssh_public_key }}"
-             -P ssh_incoming={{ openstack_ssh_access_from }}
-             -P node_port_incoming={{ openstack_node_port_access_from }}
-             -P num_etcd={{ num_etcd }}
-             -P num_masters={{ num_masters }}
-             -P num_nodes={{ num_nodes }}
-             -P num_infra={{ num_infra }}
-             -P etcd_image={{ deployment_vars[deployment_type].image }}
-             -P master_image={{ deployment_vars[deployment_type].image }}
-             -P node_image={{ deployment_vars[deployment_type].image }}
-             -P infra_image={{ deployment_vars[deployment_type].image }}
-             -P etcd_flavor={{ openstack_flavor["etcd"] }}
-             -P master_flavor={{ openstack_flavor["master"] }}
-             -P node_flavor={{ openstack_flavor["node"] }}
-             -P infra_flavor={{ openstack_flavor["infra"] }}
-             openshift-ansible-{{ cluster_id }}-stack'
-    args:
-      chdir: '{{ playbook_dir }}'
-
-  - name: Wait for OpenStack Stack readiness
-    shell: 'heat stack-show openshift-ansible-{{ cluster_id }}-stack | awk ''$2 == "stack_status" {print $4}'''
-    register: stack_show_status_result
-    until: stack_show_status_result.stdout not in ['CREATE_IN_PROGRESS', 'UPDATE_IN_PROGRESS']
-    retries: 30
-    delay: 5
-
-  - name: Display the stack resources
-    command: 'heat resource-list openshift-ansible-{{ cluster_id }}-stack'
-    register: stack_resource_list_result
-    when: stack_show_status_result.stdout not in ['CREATE_COMPLETE', 'UPDATE_COMPLETE']
-
-  - name: Display the stack status
-    command: 'heat stack-show openshift-ansible-{{ cluster_id }}-stack'
-    register: stack_show_result
-    when: stack_show_status_result.stdout not in ['CREATE_COMPLETE', 'UPDATE_COMPLETE']
-
-  - name: Delete the stack
-    command: 'heat stack-delete openshift-ansible-{{ cluster_id }}-stack'
-    when: stack_show_status_result.stdout not in ['CREATE_COMPLETE', 'UPDATE_COMPLETE']
-
-  - fail:
-      msg: |
-
-        +--------------------------------------+
-        |   ^                                  |
-        |  /!\ Failed to create the heat stack |
-        | /___\                                |
-        +--------------------------------------+
-
-        Here is the list of stack resources and their status:
-        {{ stack_resource_list_result.stdout }}
-
-        Here is the status of the stack:
-        {{ stack_show_result.stdout }}
-
-          ^   Failed to create the heat stack
-         /!\
-        /___\ Please check the `stack_status_reason` line in the above array to know why.
-    when: stack_show_status_result.stdout not in ['CREATE_COMPLETE', 'UPDATE_COMPLETE']
-
-  - name: Read OpenStack Stack outputs
-    command: 'heat stack-show openshift-ansible-{{ cluster_id }}-stack'
-    register: stack_show_result
-
-  - set_fact:
-      parsed_outputs: "{{ stack_show_result | oo_parse_heat_stack_outputs }}"
-
-  - name: Add new etcd instances groups and variables
-    add_host:
-      hostname: '{{ item[0] }}'
-      ansible_ssh_host: '{{ item[2] }}'
-      ansible_ssh_user: "{{ deployment_vars[deployment_type].ssh_user }}"
-      ansible_become: "{{ deployment_vars[deployment_type].become }}"
-      groups: 'meta-environment_{{ cluster_env }}, meta-host-type_etcd, meta-sub-host-type_default, meta-clusterid_{{ cluster_id }}'
-      openshift_node_labels:
-        type: "etcd"
-      openstack:
-        public_v4: '{{ item[2] }}'
-        private_v4: '{{ item[1] }}'
-    with_together:
-    - '{{ parsed_outputs.etcd_names }}'
-    - '{{ parsed_outputs.etcd_ips }}'
-    - '{{ parsed_outputs.etcd_floating_ips }}'
-
-  - name: Add new master instances groups and variables
-    add_host:
-      hostname: '{{ item[0] }}'
-      ansible_ssh_host: '{{ item[2] }}'
-      ansible_ssh_user: "{{ deployment_vars[deployment_type].ssh_user }}"
-      ansible_become: "{{ deployment_vars[deployment_type].become }}"
-      groups: 'meta-environment_{{ cluster_env }}, meta-host-type_master, meta-sub-host-type_default, meta-clusterid_{{ cluster_id }}'
-      openshift_node_labels:
-        type: "master"
-      openstack:
-        public_v4: '{{ item[2] }}'
-        private_v4: '{{ item[1] }}'
-    with_together:
-    - '{{ parsed_outputs.master_names }}'
-    - '{{ parsed_outputs.master_ips }}'
-    - '{{ parsed_outputs.master_floating_ips }}'
-
-  - name: Add new node instances groups and variables
-    add_host:
-      hostname: '{{ item[0] }}'
-      ansible_ssh_host: '{{ item[2] }}'
-      ansible_ssh_user: "{{ deployment_vars[deployment_type].ssh_user }}"
-      ansible_become: "{{ deployment_vars[deployment_type].become }}"
-      groups: 'meta-environment_{{ cluster_env }}, meta-host-type_node, meta-sub-host-type_compute, meta-clusterid_{{ cluster_id }}'
-      openshift_node_labels:
-        type: "compute"
-      openstack:
-        public_v4: '{{ item[2] }}'
-        private_v4: '{{ item[1] }}'
-    with_together:
-    - '{{ parsed_outputs.node_names }}'
-    - '{{ parsed_outputs.node_ips }}'
-    - '{{ parsed_outputs.node_floating_ips }}'
-
-  - name: Add new infra instances groups and variables
-    add_host:
-      hostname: '{{ item[0] }}'
-      ansible_ssh_host: '{{ item[2] }}'
-      ansible_ssh_user: "{{ deployment_vars[deployment_type].ssh_user }}"
-      ansible_become: "{{ deployment_vars[deployment_type].become }}"
-      groups: 'meta-environment_{{ cluster_env }}, meta-host-type_node, meta-sub-host-type_infra, meta-clusterid_{{ cluster_id }}'
-      openshift_node_labels:
-        type: "infra"
-      openstack:
-        public_v4: '{{ item[2] }}'
-        private_v4: '{{ item[1] }}'
-    with_together:
-    - '{{ parsed_outputs.infra_names }}'
-    - '{{ parsed_outputs.infra_ips }}'
-    - '{{ parsed_outputs.infra_floating_ips }}'
-
-  - name: Wait for ssh
-    wait_for:
-      host: '{{ item }}'
-      port: 22
-    with_flattened:
-    - '{{ parsed_outputs.master_floating_ips }}'
-    - '{{ parsed_outputs.node_floating_ips }}'
-    - '{{ parsed_outputs.infra_floating_ips }}'
-
-  - name: Wait for user setup
-    command: 'ssh -o StrictHostKeyChecking=no -o PasswordAuthentication=no -o ConnectTimeout=10 -o UserKnownHostsFile=/dev/null {{ deployment_vars[deployment_type].ssh_user }}@{{ item }} echo {{ deployment_vars[deployment_type].ssh_user }} user is setup'
-    register: result
-    until: result.rc == 0
-    retries: 30
-    delay: 1
-    with_flattened:
-    - '{{ parsed_outputs.master_floating_ips }}'
-    - '{{ parsed_outputs.node_floating_ips }}'
-    - '{{ parsed_outputs.infra_floating_ips }}'
-
-- include: update.yml
-
-- include: list.yml
diff --git a/playbooks/openstack/openshift-cluster/list.yml b/playbooks/openstack/openshift-cluster/list.yml
deleted file mode 100644
index 6c6f671be..000000000
--- a/playbooks/openstack/openshift-cluster/list.yml
+++ /dev/null
@@ -1,24 +0,0 @@
----
-- name: Generate oo_list_hosts group
-  hosts: localhost
-  become: no
-  connection: local
-  gather_facts: no
-  vars_files:
-  - vars.yml
-  tasks:
-  - set_fact: scratch_group=meta-clusterid_{{ cluster_id }}
-    when: cluster_id != ''
-  - set_fact: scratch_group=all
-    when: cluster_id == ''
-  - add_host:
-      name: "{{ item }}"
-      groups: oo_list_hosts
-      ansible_ssh_user: "{{ deployment_vars[deployment_type].ssh_user }}"
-      ansible_ssh_host: "{{ hostvars[item].ansible_ssh_host | default(item) }}"
-      ansible_become: "{{ deployment_vars[deployment_type].become }}"
-      oo_public_ipv4: "{{ hostvars[item].openstack.public_v4 }}"
-      oo_private_ipv4: "{{ hostvars[item].openstack.private_v4 }}"
-    with_items: "{{ groups[scratch_group] | default([]) | difference(['localhost']) }}"
-  - debug:
-      msg: "{{ hostvars | oo_select_keys(groups[scratch_group] | default([])) | oo_pretty_print_cluster('meta-') }}"
diff --git a/playbooks/openstack/openshift-cluster/lookup_plugins b/playbooks/openstack/openshift-cluster/lookup_plugins
deleted file mode 120000
index ac79701db..000000000
--- a/playbooks/openstack/openshift-cluster/lookup_plugins
+++ /dev/null
@@ -1 +0,0 @@
-../../../lookup_plugins
\ No newline at end of file
diff --git a/playbooks/openstack/openshift-cluster/roles b/playbooks/openstack/openshift-cluster/roles
deleted file mode 120000
index 20c4c58cf..000000000
--- a/playbooks/openstack/openshift-cluster/roles
+++ /dev/null
@@ -1 +0,0 @@
-../../../roles
\ No newline at end of file
diff --git a/playbooks/openstack/openshift-cluster/terminate.yml b/playbooks/openstack/openshift-cluster/terminate.yml
deleted file mode 100644
index affb57117..000000000
--- a/playbooks/openstack/openshift-cluster/terminate.yml
+++ /dev/null
@@ -1,49 +0,0 @@
----
-- name: Terminate instance(s)
-  hosts: localhost
-  become: no
-  connection: local
-  gather_facts: no
-  vars_files:
-  - vars.yml
-  tasks:
-  - add_host:
-      name: "{{ item }}"
-      groups: oo_hosts_to_terminate
-      ansible_ssh_user: "{{ deployment_vars[deployment_type].ssh_user }}"
-      ansible_become: "{{ deployment_vars[deployment_type].become }}"
-    with_items: "{{ (groups['meta-environment_' ~ cluster_env]|default([])) | intersect(groups['meta-clusterid_' ~ cluster_id ]|default([])) }}"
-
-- name: Unsubscribe VMs
-  hosts: oo_hosts_to_terminate
-  vars_files:
-  - vars.yml
-  roles:
-  - role: rhel_unsubscribe
-    when: deployment_type in ['atomic-enterprise', 'enterprise', 'openshift-enterprise'] and
-          ansible_distribution == "RedHat" and
-          lookup('oo_option', 'rhel_skip_subscription') | default(rhsub_skip, True) |
-            default('no', True) | lower in ['no', 'false']
-
-- hosts: localhost
-  become: no
-  connection: local
-  gather_facts: no
-  vars_files:
-  - vars.yml
-  tasks:
-  - name: Delete the OpenStack Stack
-    command: 'heat stack-delete openshift-ansible-{{ cluster_id }}-stack'
-    register: stack_delete_result
-    changed_when: stack_delete_result.rc == 0
-    failed_when: stack_delete_result.rc != 0 and 'could not be found' not in stack_delete_result.stdout
-
-  - name: Wait for the completion of the OpenStack Stack deletion
-    shell: 'heat stack-show openshift-ansible-{{ cluster_id }}-stack | awk ''$2 == "stack_status" {print $4}'''
-    when: stack_delete_result.changed
-    register: stack_show_result
-    until: stack_show_result.stdout != 'DELETE_IN_PROGRESS'
-    retries: 60
-    delay: 5
-    failed_when: '"Stack not found" not in stack_show_result.stderr and
-                   stack_show_result.stdout != "DELETE_COMPLETE"'
diff --git a/playbooks/openstack/openshift-cluster/update.yml b/playbooks/openstack/openshift-cluster/update.yml
deleted file mode 100644
index 6d2af3d26..000000000
--- a/playbooks/openstack/openshift-cluster/update.yml
+++ /dev/null
@@ -1,34 +0,0 @@
----
-- hosts: localhost
-  gather_facts: no
-  tasks:
-  - include_vars: vars.yml
-  - include_vars: cluster_hosts.yml
-  - add_host:
-      name: "{{ item }}"
-      groups: l_oo_all_hosts
-    with_items: "{{ g_all_hosts }}"
-
-- hosts: l_oo_all_hosts
-  gather_facts: no
-  tasks:
-  - include_vars: vars.yml
-  - include_vars: cluster_hosts.yml
-
-- name: Populate oo_hosts_to_update group
-  hosts: localhost
-  connection: local
-  become: no
-  gather_facts: no
-  tasks:
-  - name: Evaluate oo_hosts_to_update
-    add_host:
-      name: "{{ item }}"
-      groups: oo_hosts_to_update
-      ansible_ssh_user: "{{ deployment_vars[deployment_type].ssh_user }}"
-      ansible_become: "{{ deployment_vars[deployment_type].become }}"
-    with_items: "{{ g_all_hosts | default([]) }}"
-
-- include: ../../common/openshift-cluster/update_repos_and_packages.yml
-
-- include: config.yml
diff --git a/playbooks/openstack/openshift-cluster/vars.yml b/playbooks/openstack/openshift-cluster/vars.yml
deleted file mode 100644
index ba2855b73..000000000
--- a/playbooks/openstack/openshift-cluster/vars.yml
+++ /dev/null
@@ -1,38 +0,0 @@
-# yamllint disable rule:colons
----
-debug_level: 2
-openstack_infra_heat_stack:     "{{ lookup('oo_option', 'infra_heat_stack' ) |
-                                    default('files/heat_stack.yaml',         True) }}"
-openstack_subnet_24_prefix:     "{{ lookup('oo_option', 'subnet_24_prefix'         ) |
-                                    default('192.168.' + ( ( 1048576 | random % 256 ) | string() ), True) }}"
-openstack_network_external_net: "{{ lookup('oo_option', 'external_net'     ) |
-                                    default('external',                      True) }}"
-openstack_network_dns:          "{{ lookup('oo_option', 'dns'              ) |
-                                    default('8.8.8.8,8.8.4.4',               True) | oo_split() }}"
-openstack_ssh_public_key:       "{{ lookup('file', lookup('oo_option', 'public_key') |
-                                    default('~/.ssh/id_rsa.pub',             True)) }}"
-openstack_ssh_access_from:      "{{ lookup('oo_option', 'ssh_from')          |
-                                    default('0.0.0.0/0',                     True) }}"
-openstack_node_port_access_from: "{{ lookup('oo_option', 'node_port_from')   |
-                                    default('0.0.0.0/0',                     True) }}"
-openstack_heat_timeout:         "{{ lookup('oo_option', 'heat_timeout')   |
-                                    default('3',                             True) }}"
-openstack_flavor:
-  etcd:   "{{ lookup('oo_option', 'etcd_flavor'      ) | default('m1.small',  True) }}"
-  master: "{{ lookup('oo_option', 'master_flavor'    ) | default('m1.small',  True) }}"
-  infra:  "{{ lookup('oo_option', 'infra_flavor'     ) | default('m1.small',  True) }}"
-  node:   "{{ lookup('oo_option', 'node_flavor'      ) | default('m1.medium', True) }}"
-
-deployment_rhel7_ent_base:
-  image: "{{ lookup('oo_option', 'image_name') | default('rhel-guest-image-7.2-20151102.0.x86_64', True) }}"
-  ssh_user: openshift
-  become: yes
-
-deployment_vars:
-  origin:
-    image: "{{ lookup('oo_option', 'image_name') | default('centos-70-raw', True) }}"
-    ssh_user: openshift
-    become: yes
-  enterprise: "{{ deployment_rhel7_ent_base }}"
-  openshift-enterprise: "{{ deployment_rhel7_ent_base }}"
-  atomic-enterprise: "{{ deployment_rhel7_ent_base }}"