prune cluster

playbooks/groups/os-cluster.yml

@@ -57,106 +57,6 @@
         option: pipelining
         value: "True"
 
-- name: Setup cluster masters pre-reqs
-  hosts: os-masters-stg:os-masters
-  tags:
-    - os-cluster-prereq
-  user: root
-  gather_facts: True
-
-  vars_files:
-    - /srv/web/infra/ansible/vars/global.yml
-    - "/srv/private/ansible/vars.yml"
-    - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml
-
-  tasks:
-    - name: ensure origin conf dir exists
-      file:
-        path: "/etc/origin"
-        state: "directory"
-
-    - name: create cert dir for openshift public facing REST API SSL
-      file:
-        path: "/etc/origin/master/named_certificates"
-        state: "directory"
-
-    - name: install cert for openshift public facing REST API SSL
-      copy:
-        src: "{{private}}/files/os/{{env}}/os-internal.pem"
-        dest: "/etc/origin/master/named_certificates/{{os}}.pem"
-
-    - name: install key for openshift public facing REST API SSL
-      copy:
-        src: "{{private}}/files/os/{{env}}/os-internal.key"
-        dest: "/etc/origin/master/named_certificates/{{os}}.key"
-
-    - name: place htpasswd file
-      copy:
-        src: "{{private}}/files/httpd/os-{{env}}.htpasswd"
-        dest: /etc/origin/htpasswd
-
-
-- name: Setup cluster hosts pre-reqs
-  hosts: os-masters-stg:os-nodes-stg:os-masters:os-nodes
-  tags:
-    - os-cluster-prereq
-  user: root
-  gather_facts: True
-
-  vars_files:
-    - /srv/web/infra/ansible/vars/global.yml
-    - "/srv/private/ansible/vars.yml"
-    - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml
-
-  handlers:
-    - name: restart NetworkManager
-      service:
-        name: NetworkManager
-        state: restarted
-
-  tasks:
-    - name: Install necessary packages that openshift-ansible needs
-      package: name="{{ item }}" state=installed
-      with_items:
-        - tar
-        - rsync
-        - dbus-python
-        - NetworkManager
-        - libselinux-python
-        - origin
-
-    - name: Deploy controller public ssh keys to os cluster hosts
-      authorized_key:
-        user: root
-        key: "{{ lookup('file', '{{private}}/files/os/{{env}}/control_key.pub') }}"
-
-    # This is required for OpenShift built-in SkyDNS inside the overlay network
-    # of the cluster
-    - name: ensure NM_CONTROLLED is set to "yes" for os cluster
-      lineinfile:
-        dest: "/etc/sysconfig/network-scripts/ifcfg-eth0"
-        line: "NM_CONTROLLED=yes"
-      notify:
-        - restart NetworkManager
-
-    # This is required for OpenShift built-in SkyDNS inside the overlay network
-    # of the cluster
-    - name: ensure NetworkManager is enabled and started
-      service:
-        name: NetworkManager
-        state: started
-        enabled: yes
-
-    - name: cron entry to clean up docker storage
-      copy:
-        src: "{{files}}/os/cleanup-docker-storage"
-        dest: "/etc/cron.d/cleanup-docker-storage"
-
-    - name: copy docker-storage-setup config
-      copy:
-        src: "{{files}}/os/docker-storage-setup"
-        dest:  "/etc/sysconfig/docker-storage-setup"
-
 - name: Deploy OpenShift cluster
   hosts: os-control-stg
   tags:
@@ -169,7 +69,6 @@
     - "/srv/private/ansible/vars.yml"
     - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml
 
-
   roles:
     - {
       role: ansible-ansible-openshift-ansible,