aboutsummaryrefslogtreecommitdiffstats
path: root/puppet/services/cinder-api.yaml
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-01-16 15:53:59 +0000
committerGerrit Code Review <review@openstack.org>2017-01-16 15:53:59 +0000
commit0080df3f4207bed5b0fd2911b626463d9a013d46 (patch)
tree62a27aef5334579cc3b89c9019419435b4b3b257 /puppet/services/cinder-api.yaml
parent15c358de1c8a2d338953a712573c85fb451f05f3 (diff)
parent11f3bde268f705cf2eb3ba26b338de4fd7e95ac3 (diff)
Merge "Add cinder service support for composable upgrades"
Diffstat (limited to 'puppet/services/cinder-api.yaml')
-rw-r--r--puppet/services/cinder-api.yaml16
1 files changed, 16 insertions, 0 deletions
diff --git a/puppet/services/cinder-api.yaml b/puppet/services/cinder-api.yaml
index 376ea2c5..7d197831 100644
--- a/puppet/services/cinder-api.yaml
+++ b/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