Merge "Upgrade nova-api/scheduler/conductor packages at step3 not step2."

puppet/services/README.rst

@@ -104,7 +104,9 @@ step, "step2" for the second, etc.
 
    2) Stop all control-plane services, ready for upgrade
 
-   3) Perform a package update, (either specific packages or the whole system)
+   3) Perform a package update and install new packages: A general
+      upgrade is done, and only new package should go into service
+      ansible tasks.
 
    4) Start services needed for migration tasks (e.g DB)
 

puppet/services/nova-api.yaml

@@ -197,9 +197,6 @@ outputs:
         - name: Stop and disable nova_api service (pre-upgrade not under httpd)
           tags: step2
           service: name=openstack-nova-api state=stopped enabled=no
-        - name: update nova api
-          tags: step2
-          yum: name=openstack-nova-api state=latest
         - name: Create puppet manifest to set transport_url in nova.conf
           tags: step5
           when: is_bootstrap_node

puppet/services/nova-conductor.yaml

@@ -69,13 +69,10 @@ outputs:
         - name: Stop nova_conductor service
           tags: step2
           service: name=openstack-nova-conductor state=stopped
-        - name: update nova conductor
-          tags: step2
-          yum: name=openstack-nova-conductor state=latest
         # If not already set by puppet (e.g a pre-ocata version), set the
         # upgrade_level for compute to "auto"
         - name: Set compute upgrade level to auto
-          tags: step3
+          tags: step2
           ini_file:
             str_replace:
               template: "dest=/etc/nova/nova.conf section=upgrade_levels option=compute value=LEVEL"

puppet/services/nova-scheduler.yaml

@@ -67,6 +67,3 @@ outputs:
         - name: Stop nova_scheduler service
           tags: step2
           service: name=openstack-nova-scheduler state=stopped
-        - name: update nova scheduler
-          tags: step2
-          yum: name=openstack-nova-scheduler state=latest