Merge "Add cinder service support for composable upgrades"

puppet/services/cinder-api.yaml

@@ -147,3 +147,19 @@ outputs:
           cinder::db::mysql::allowed_hosts:
             - '%'
             - "%{hiera('mysql_bind_host')}"
+      upgrade_tasks:
+        - name: check for cinder running under apache (post upgrade)
+          tags: step2
+          shell: "apachectl -t -D DUMP_VHOSTS | grep -q cinder"
+          register: cinder_apache
+          ignore_errors: true
+        - name: Stop cinder_api service (running under httpd)
+          tags: step2
+          service: name=httpd state=stopped
+          when: "cinder_apache.rc == 0"
+        - 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

@@ -51,3 +51,10 @@ outputs:
           - cinder::scheduler::scheduler_driver: cinder.scheduler.filter_scheduler.FilterScheduler
       step_config: |
         include ::tripleo::profile::base::cinder::scheduler
+      upgrade_tasks:
+        - 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

@@ -110,3 +110,14 @@ outputs:
             tripleo::profile::base::cinder::volume::iscsi::cinder_iscsi_address: {get_param: [ServiceNetMap, CinderIscsiNetwork]}
       step_config: |
         include ::tripleo::profile::base::cinder::volume
+      upgrade_tasks:
+        - name: Stop cinder_volume service
+          tags: step2
+          service: name=openstack-cinder-volume state=stopped
+        - 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
+