Merge pull request #5201 from mtnbikenc/remove-unsupported

Remove unsupported playbooks and utilities

12 files changed, 0 insertions, 590 deletions

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