aboutsummaryrefslogtreecommitdiffstats
path: root/puppet
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-04-27 20:20:11 +0000
committerGerrit Code Review <review@openstack.org>2017-04-27 20:20:11 +0000
commit0eb083109994f07921891316355ec32612c0d6a3 (patch)
tree0137f268789e264f7cd2512fdb00476b0876d177 /puppet
parent42c5ff96c6cc91ecf999556097e5909572efaf64 (diff)
parent2e25d117e10ddba126d2e130cd6987e93f591589 (diff)
Merge "Cinder-api upgrade: use httpd instead of apachectl" into stable/ocata
Diffstat (limited to 'puppet')
-rw-r--r--puppet/services/cinder-api.yaml2
1 files changed, 1 insertions, 1 deletions
diff --git a/puppet/services/cinder-api.yaml b/puppet/services/cinder-api.yaml
index c0ea7aaa..49a5f613 100644
--- a/puppet/services/cinder-api.yaml
+++ b/puppet/services/cinder-api.yaml
@@ -161,7 +161,7 @@ outputs:
tags: step0,validation
- name: check for cinder running under apache (post upgrade)
tags: step1
- shell: "apachectl -t -D DUMP_VHOSTS | grep -q cinder"
+ shell: "httpd -t -D DUMP_VHOSTS | grep -q cinder"
register: cinder_apache
ignore_errors: true
- name: Stop cinder_api service (running under httpd)