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

@@ -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
+