Disable old openshift-master.service on upgrade

openshift · Aug 8, 2017 · b3c610d · b3c610d
1 parent dcc8a41
commit b3c610d
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 0 deletions.
diff --git a/playbooks/common/openshift-cluster/upgrades/upgrade_control_plane.yml b/playbooks/common/openshift-cluster/upgrades/upgrade_control_plane.yml
@@ -91,6 +91,9 @@
 
   - include_vars: ../../../../roles/openshift_master/vars/main.yml
 
+  - name: Remove any legacy systemd units
+    include: ../../../../roles/openshift_master/tasks/clean_systemd_units.yml
+
   - name: Update systemd units
     include: ../../../../roles/openshift_master/tasks/systemd_units.yml
 

diff --git a/roles/openshift_master/tasks/clean_systemd_units.yml b/roles/openshift_master/tasks/clean_systemd_units.yml
@@ -0,0 +1,5 @@
+---
+
+- name: Disable master service
+  systemd: name={{ openshift.common.service_type }}-master state=stopped enabled=no masked=yes
+  ignore_errors: true
diff --git a/roles/openshift_master/tasks/main.yml b/roles/openshift_master/tasks/main.yml
@@ -144,6 +144,9 @@
     local_facts:
       no_proxy_etcd_host_ips: "{{ openshift_no_proxy_etcd_host_ips }}"
 
+- name: Remove the legacy master service if it exists
+  include: clean_systemd_units.yml
+
 - name: Install the systemd units
   include: systemd_units.yml