From fa67d37245d53f4ea7222b0d4d970ede48fee94b Mon Sep 17 00:00:00 2001
From: Devan Goodwin <dgoodwin@redhat.com>
Date: Tue, 10 Nov 2015 09:46:13 -0400
Subject: 1279734: Ensure services are enabled after upgrade.

With the openshift to atomic-openshift renames, some services were not enabled
after upgrade. Added enabled directives to all service restart lines in the
upgrade playbook.
---
 playbooks/adhoc/upgrades/upgrade.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'playbooks')

diff --git a/playbooks/adhoc/upgrades/upgrade.yml b/playbooks/adhoc/upgrades/upgrade.yml
index 7ce2698db..30f911f6f 100644
--- a/playbooks/adhoc/upgrades/upgrade.yml
+++ b/playbooks/adhoc/upgrades/upgrade.yml
@@ -226,7 +226,7 @@
     when: inventory_hostname != groups.masters.0
 
   - name: Restart master services
-    service: name="{{ openshift.common.service_type}}-master" state=restarted
+    service: name="{{ openshift.common.service_type}}-master" enabled=yes state=restarted
     when: not openshift_master_ha | bool
 
 - name: Destroy cluster
@@ -250,7 +250,7 @@
     openshift_master_ha: "{{ groups['masters'] | length > 1 }}"
   tasks:
   - name: Start pcsd
-    service: name=pcsd state=started
+    service: name=pcsd enabled=yes state=started
     when: openshift_master_ha | bool
 
 - name: Re-create cluster
@@ -281,7 +281,7 @@
     - name: Upgrade node packages
       command: yum update -y {{ openshift.common.service_type }}-node{{ openshift_version }}
     - name: Restart node services
-      service: name="{{ openshift.common.service_type }}-node" state=restarted
+      service: name="{{ openshift.common.service_type }}-node" enabled=yes state=restarted
 
 - name: Update cluster policy and policy bindings
   hosts: masters[0]
@@ -311,7 +311,7 @@
     openshift_master_ha: "{{ groups['masters'] | length > 1 }}"
   tasks:
     - name: Restart master services
-      service: name="{{ openshift.common.service_type}}-master" state=restarted
+      service: name="{{ openshift.common.service_type}}-master" enabled=yes state=restarted
       when: not openshift_master_ha | bool
 
 - name: Restart cluster post reconcile
-- 
cgit v1.2.3


From 28d601beeebaacd5e79b3fec336a283c8bf20e68 Mon Sep 17 00:00:00 2001
From: Devan Goodwin <dgoodwin@redhat.com>
Date: Tue, 10 Nov 2015 13:39:04 -0400
Subject: Add separate step to enable services during upgrade.

Instead of combining this with tasks to restart services, add a separate
started+enabled play for masters and nodes at the end of the playbook.
---
 playbooks/adhoc/upgrades/upgrade.yml | 22 +++++++++++++++++++---
 1 file changed, 19 insertions(+), 3 deletions(-)

(limited to 'playbooks')

diff --git a/playbooks/adhoc/upgrades/upgrade.yml b/playbooks/adhoc/upgrades/upgrade.yml
index 30f911f6f..324f5fba3 100644
--- a/playbooks/adhoc/upgrades/upgrade.yml
+++ b/playbooks/adhoc/upgrades/upgrade.yml
@@ -226,7 +226,7 @@
     when: inventory_hostname != groups.masters.0
 
   - name: Restart master services
-    service: name="{{ openshift.common.service_type}}-master" enabled=yes state=restarted
+    service: name="{{ openshift.common.service_type}}-master" state=restarted
     when: not openshift_master_ha | bool
 
 - name: Destroy cluster
@@ -281,7 +281,7 @@
     - name: Upgrade node packages
       command: yum update -y {{ openshift.common.service_type }}-node{{ openshift_version }}
     - name: Restart node services
-      service: name="{{ openshift.common.service_type }}-node" enabled=yes state=restarted
+      service: name="{{ openshift.common.service_type }}-node" state=restarted
 
 - name: Update cluster policy and policy bindings
   hosts: masters[0]
@@ -311,7 +311,7 @@
     openshift_master_ha: "{{ groups['masters'] | length > 1 }}"
   tasks:
     - name: Restart master services
-      service: name="{{ openshift.common.service_type}}-master" enabled=yes state=restarted
+      service: name="{{ openshift.common.service_type}}-master" state=restarted
       when: not openshift_master_ha | bool
 
 - name: Restart cluster post reconcile
@@ -389,3 +389,19 @@
     openshift_deployment_type: "{{ deployment_type }}"
   roles:
     - openshift_examples
+
+- name: Ensure master services enabled
+  hosts: masters
+  vars:
+    openshift_master_ha: "{{ groups['masters'] | length > 1 }}"
+  tasks:
+  - name: Enable master services
+    service: name="{{ openshift.common.service_type}}-master" state=started enabled=yes
+    when: not openshift_master_ha | bool
+
+- name: Ensure node services enabled
+  hosts: nodes
+  tasks:
+    - name: Restart node services
+      service: name="{{ openshift.common.service_type }}-node" state=started enabled=yes
+
-- 
cgit v1.2.3