13 files changed, 25 insertions, 139 deletions
diff --git a/playbooks/common/openshift-checks/adhoc.yml b/playbooks/common/openshift-checks/adhoc.yml
deleted file mode 100644
index d0deaeb65..000000000
--- a/playbooks/common/openshift-checks/adhoc.yml
+++ /dev/null
@@ -1,13 +0,0 @@
----
-- name: OpenShift Health Checks
-  hosts: oo_all_hosts
-
-  roles:
-  - openshift_health_checker
-  vars:
-  - r_openshift_health_checker_playbook_context: adhoc
-  post_tasks:
-  - name: Run health checks (adhoc)
-    action: openshift_health_check
-    args:
-      checks: '{{ openshift_checks | default([]) }}'
diff --git a/playbooks/common/openshift-checks/health.yml b/playbooks/common/openshift-checks/health.yml
deleted file mode 100644
index d0921b9d3..000000000
--- a/playbooks/common/openshift-checks/health.yml
+++ /dev/null
@@ -1,13 +0,0 @@
----
-- name: OpenShift Health Checks
-  hosts: oo_all_hosts
-
-  roles:
-  - openshift_health_checker
-  vars:
-  - r_openshift_health_checker_playbook_context: health
-  post_tasks:
-  - name: Run health checks (@health)
-    action: openshift_health_check
-    args:
-      checks: ['@health']
diff --git a/playbooks/common/openshift-checks/install.yml b/playbooks/common/openshift-checks/install.yml
deleted file mode 100644
index 93cf6c359..000000000
--- a/playbooks/common/openshift-checks/install.yml
+++ /dev/null
@@ -1,51 +0,0 @@
----
-- name: Health Check Checkpoint Start
-  hosts: all
-  gather_facts: false
-  tasks:
-  - name: Set Health Check 'In Progress'
-    run_once: true
-    set_stats:
-      data:
-        installer_phase_health:
-          status: "In Progress"
-          start: "{{ lookup('pipe', 'date +%Y%m%d%H%M%SZ') }}"
-
-- name: OpenShift Health Checks
-  hosts: oo_all_hosts
-  any_errors_fatal: true
-  roles:
-  - openshift_health_checker
-  vars:
-  - r_openshift_health_checker_playbook_context: install
-  post_tasks:
-  - name: Run health checks (install) - EL
-    when: ansible_distribution != "Fedora"
-    action: openshift_health_check
-    args:
-      checks:
-      - disk_availability
-      - memory_availability
-      - package_availability
-      - package_version
-      - docker_image_availability
-      - docker_storage
-
-  - name: Run health checks (install) - Fedora
-    when: ansible_distribution == "Fedora"
-    action: openshift_health_check
-    args:
-      checks:
-      - docker_image_availability
-
-- name: Health Check Checkpoint End
-  hosts: all
-  gather_facts: false
-  tasks:
-  - name: Set Health Check 'Complete'
-    run_once: true
-    set_stats:
-      data:
-        installer_phase_health:
-          status: "Complete"
-          end: "{{ lookup('pipe', 'date +%Y%m%d%H%M%SZ') }}"
diff --git a/playbooks/common/openshift-checks/pre-install.yml b/playbooks/common/openshift-checks/pre-install.yml
deleted file mode 100644
index 32449d4e4..000000000
--- a/playbooks/common/openshift-checks/pre-install.yml
+++ /dev/null
@@ -1,13 +0,0 @@
----
-- name: OpenShift Health Checks
-  hosts: oo_all_hosts
-
-  roles:
-  - openshift_health_checker
-  vars:
-  - r_openshift_health_checker_playbook_context: pre-install
-  post_tasks:
-  - name: Run health checks (@preflight)
-    action: openshift_health_check
-    args:
-      checks: ['@preflight']
diff --git a/playbooks/common/openshift-checks/roles b/playbooks/common/openshift-checks/roles
deleted file mode 120000
index 20c4c58cf..000000000
--- a/playbooks/common/openshift-checks/roles
+++ /dev/null
@@ -1 +0,0 @@
-../../../roles
-\ No newline at end of file
diff --git a/playbooks/common/openshift-cluster/config.yml b/playbooks/common/openshift-cluster/config.yml
index 6b78493b9..77b7a903f 100644
--- a/playbooks/common/openshift-cluster/config.yml
+++ b/playbooks/common/openshift-cluster/config.yml
@@ -1,9 +1,9 @@
 ---
-- include: ../openshift-checks/install.yml
+- include: ../../openshift-checks/private/install.yml
 
 - include: ../../openshift-etcd/private/config.yml
 
-- include: ../openshift-nfs/config.yml
+- include: ../../openshift-nfs/private/config.yml
   when: groups.oo_nfs_to_config | default([]) | count > 0
 
 - include: ../openshift-loadbalancer/config.yml
diff --git a/playbooks/common/openshift-cluster/upgrades/etcd/upgrade.yml b/playbooks/common/openshift-cluster/upgrades/etcd/upgrade.yml
index d71c96cd7..c76b3053d 100644
--- a/playbooks/common/openshift-cluster/upgrades/etcd/upgrade.yml
+++ b/playbooks/common/openshift-cluster/upgrades/etcd/upgrade.yml
@@ -93,6 +93,14 @@
   vars:
     etcd_upgrade_version: '3.1.3'
 
+- include: upgrade_rpm_members.yml
+  vars:
+    etcd_upgrade_version: '3.2'
+
+- include: upgrade_image_members.yml
+  vars:
+    etcd_upgrade_version: '3.2.7'
+
 - name: Upgrade fedora to latest
   hosts: oo_etcd_hosts_to_upgrade
   serial: 1
diff --git a/playbooks/common/openshift-cluster/upgrades/upgrade_control_plane.yml b/playbooks/common/openshift-cluster/upgrades/upgrade_control_plane.yml
index 399b818a7..fa65567c2 100644
--- a/playbooks/common/openshift-cluster/upgrades/upgrade_control_plane.yml
+++ b/playbooks/common/openshift-cluster/upgrades/upgrade_control_plane.yml
@@ -317,13 +317,13 @@
     delay: 60
 
   roles:
-  - lib_openshift
   - openshift_facts
-  - docker
-  - openshift_node_dnsmasq
-  - openshift_node_upgrade
-
   post_tasks:
+  - include_role:
+      name: openshift_node
+      tasks_from: upgrade.yml
+    vars:
+      openshift_node_upgrade_in_progress: True
   - name: Set node schedulability
     oc_adm_manage_node:
       node: "{{ openshift.node.nodename | lower }}"
diff --git a/playbooks/common/openshift-cluster/upgrades/upgrade_nodes.yml b/playbooks/common/openshift-cluster/upgrades/upgrade_nodes.yml
index c93a5d89c..5dc8193a7 100644
--- a/playbooks/common/openshift-cluster/upgrades/upgrade_nodes.yml
+++ b/playbooks/common/openshift-cluster/upgrades/upgrade_nodes.yml
@@ -34,16 +34,18 @@
     delay: 60
 
   roles:
-  - lib_openshift
   - openshift_facts
-  - docker
-  - openshift_node_dnsmasq
-  - openshift_node_upgrade
-  - role: openshift_excluder
-    r_openshift_excluder_action: enable
-    r_openshift_excluder_service_type: "{{ openshift.common.service_type }}"
-
   post_tasks:
+  - include_role:
+      name: openshift_node
+      tasks_from: upgrade.yml
+    vars:
+      openshift_node_upgrade_in_progress: True
+  - include_role:
+      name: openshift_excluder
+    vars:
+      r_openshift_excluder_action: enable
+      r_openshift_excluder_service_type: "{{ openshift.common.service_type }}"
   - name: Set node schedulability
     oc_adm_manage_node:
       node: "{{ openshift.node.nodename | lower }}"
diff --git a/playbooks/common/openshift-nfs/config.yml b/playbooks/common/openshift-nfs/config.yml
deleted file mode 100644
index 6ea77e00b..000000000
--- a/playbooks/common/openshift-nfs/config.yml
+++ /dev/null
@@ -1,30 +0,0 @@
----
-- name: NFS Install Checkpoint Start
-  hosts: all
-  gather_facts: false
-  tasks:
-  - name: Set NFS install 'In Progress'
-    run_once: true
-    set_stats:
-      data:
-        installer_phase_nfs:
-          status: "In Progress"
-          start: "{{ lookup('pipe', 'date +%Y%m%d%H%M%SZ') }}"
-
-- name: Configure nfs
-  hosts: oo_nfs_to_config
-  roles:
-  - role: os_firewall
-  - role: openshift_storage_nfs
-
-- name: NFS Install Checkpoint End
-  hosts: all
-  gather_facts: false
-  tasks:
-  - name: Set NFS install 'Complete'
-    run_once: true
-    set_stats:
-      data:
-        installer_phase_nfs:
-          status: "Complete"
-          end: "{{ lookup('pipe', 'date +%Y%m%d%H%M%SZ') }}"
diff --git a/playbooks/common/openshift-nfs/filter_plugins b/playbooks/common/openshift-nfs/filter_plugins
deleted file mode 120000
index 99a95e4ca..000000000
--- a/playbooks/common/openshift-nfs/filter_plugins
+++ /dev/null
@@ -1 +0,0 @@
-../../../filter_plugins
-\ No newline at end of file
diff --git a/playbooks/common/openshift-nfs/lookup_plugins b/playbooks/common/openshift-nfs/lookup_plugins
deleted file mode 120000
index ac79701db..000000000
--- a/playbooks/common/openshift-nfs/lookup_plugins
+++ /dev/null
@@ -1 +0,0 @@
-../../../lookup_plugins
-\ No newline at end of file
diff --git a/playbooks/common/openshift-nfs/roles b/playbooks/common/openshift-nfs/roles
deleted file mode 120000
index e2b799b9d..000000000
--- a/playbooks/common/openshift-nfs/roles
+++ /dev/null
@@ -1 +0,0 @@
-../../../roles/
-\ No newline at end of file