From: Juan Antonio Osorio Robles <jaosorior@redhat.com>
Date: Mon, 6 Mar 2017 12:21:10 +0000 (+0200)
Subject: Cinder-api upgrade: use httpd instead of apachectl
X-Git-Tag: opnfv-6.0.0~959^2
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=0b05d7fd9b0e8811755499642647919eaf64cc39;p=apex-tripleo-heat-templates.git

Cinder-api upgrade: use httpd instead of apachectl

It doesn't work downstream, so the httpd command was recommended.

Change-Id: I4807333b80dad10f16e5deb56cbfdda656cd1e50
---

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)