Don't start all services during upgrade steps

Currently we start all OpenStack services in step6, but puppet
already does this, and sometimes services require configuration
to account for the new version after the yum update before they
will start.

So instead of reimplementing that configuration management in
ansible, just defer starting the services until puppet has run
which will happen right after the ansible upgrade steps complete.

Note there are some DB sync operations etc that we may also be able
to remove and let puppet do those steps, but I've left those in
for now, as we know there are some actions during that phase
e.g nova cells setup, which aren't yet handled by puppet.

Change-Id: Idc8e253167a4bc74b086830cfabf28d4aab97d28

puppet/services/cinder-api.yaml

@@ -160,6 +160,3 @@ outputs:
         - name: Stop and disable cinder_api service (pre-upgrade not under httpd)
           tags: step2
           service: name=openstack-cinder-api state=stopped enabled=no
-        - name: Start cinder_api service (running under httpd)
-          tags: step6
-          service: name=httpd state=started

puppet/services/cinder-scheduler.yaml

@@ -55,6 +55,3 @@ outputs:
         - name: Stop cinder_scheduler service
           tags: step2
           service: name=openstack-cinder-scheduler state=stopped
-        - name: Start cinder_scheduler service
-          tags: step6
-          service: name=openstack-cinder-scheduler state=started

puppet/services/cinder-volume.yaml

@@ -117,7 +117,3 @@ outputs:
         - name: Sync cinder_volume DB
           tags: step5
           command: cinder-manage db sync
-        - name: Start cinder_volume service
-          tags: step6
-          service: name=openstack-cinder-volume state=started
-

puppet/services/glance-api.yaml

@@ -115,6 +115,3 @@ outputs:
         - name: Sync glance_api DB
           tags: step5
           command: glance-manage --config-file=/etc/glance/glance-api.conf db_sync
-        - name: Start glance_api service
-          tags: step6
-          service: name=openstack-glance-api state=started

puppet/services/heat-api-cfn.yaml

@@ -88,7 +88,3 @@ outputs:
         - name: Stop heat_api_cfn service
           tags: step2
           service: name=openstack-heat-api-cfn state=stopped
-        - name: Start heat_api_cfn service
-          tags: step6
-          service: name=openstack-heat-api-cfn state=started
-

puppet/services/heat-api-cloudwatch.yaml

@@ -70,6 +70,3 @@ outputs:
         - name: Stop heat_api_cloudwatch service
           tags: step2
           service: name=openstack-heat-api-cloudwatch state=stopped
-        - name: Start heat_api_cloudwatch service
-          tags: step6
-          service: name=openstack-heat-api state=started

puppet/services/heat-api.yaml

@@ -88,6 +88,3 @@ outputs:
         - name: Stop heat_api service
           tags: step2
           service: name=openstack-heat-api state=stopped
-        - name: Start heat_api service
-          tags: step6
-          service: name=openstack-heat-api state=started

puppet/services/heat-engine.yaml

@@ -144,6 +144,3 @@ outputs:
         - name: Sync heat_engine DB
           tags: step5
           command: heat-manage --config-file /etc/heat/heat.conf db_sync
-        - name: Start heat_engine service
-          tags: step6
-          service: name=openstack-heat-engine state=started

puppet/services/keystone.yaml

@@ -258,6 +258,3 @@ outputs:
         - name: Sync keystone DB
           tags: step5
           command: keystone-manage db_sync
-        - name: Start keystone service (running under httpd)
-          tags: step6
-          service: name=httpd state=started

puppet/services/neutron-api.yaml

@@ -167,7 +167,3 @@ outputs:
         - name: Sync neutron_api DB
           tags: step5
           command: neutron-db-manage --config-file /etc/neutron/neutron.conf --config-file /etc/neutron/plugin.ini upgrade head
-        - name: Start neutron_api service
-          tags: step6
-          service: name=neutron-server state=started
-

puppet/services/neutron-dhcp.yaml

@@ -78,6 +78,3 @@ outputs:
         - name: Stop neutron_dhcp service
           tags: step2
           service: name=neutron-dhcp-agent state=stopped
-        - name: Start neutron_dhcp service
-          tags: step6
-          service: name=neutron-dhcp-agent state=started

puppet/services/neutron-l3.yaml

@@ -83,6 +83,3 @@ outputs:
         - name: Stop neutron_l3 service
           tags: step2
           service: name=neutron-l3-agent state=stopped
-        - name: Start neutron_l3 service
-          tags: step6
-          service: name=neutron-l3-agent state=started

puppet/services/neutron-metadata.yaml

@@ -79,6 +79,3 @@ outputs:
         - name: Stop neutron_metadata service
           tags: step2
           service: name=neutron-metadata-agent state=stopped
-        - name: Start neutron_metadata service
-          tags: step6
-          service: name=neutron-metadata-agent state=started

puppet/services/neutron-ovs-agent.yaml

@@ -124,7 +124,3 @@ outputs:
         - name: Stop neutron_ovs_agent service
           tags: step2
           service: name=neutron-openvswitch-agent state=stopped
-        - name: Start neutron_ovs_agent service
-          tags: step6
-          service: name=neutron-openvswitch-agent state=started
-