From: Juan Antonio Osorio Robles <jaosorior@redhat.com>
Date: Mon, 17 Oct 2016 07:16:11 +0000 (+0300)
Subject: Deploy cinder over Apache httpd
X-Git-Tag: opnfv-6.0.0~511^2
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=3ae5b6d7033480a109da237aeba7b18b6f85e32e;p=apex-puppet-tripleo.git

Deploy cinder over Apache httpd

This adds the necessary resources to the manifest to run cinder
to run over httpd. The service name will be moved to t-h-t in a
subsequent commit, but since this patch depends on t-h-t, we try to
avoid circular dependencies of repos.

Change-Id: I950257e3b5d8db071752e53557115429574e98e2
Depends-On: Ic1967a6f4f60a273965811516f33121115d518b4
---

diff --git a/manifests/profile/base/cinder/api.pp b/manifests/profile/base/cinder/api.pp
index 31635eb..fa6574d 100644
--- a/manifests/profile/base/cinder/api.pp
+++ b/manifests/profile/base/cinder/api.pp
@@ -40,7 +40,10 @@ class tripleo::profile::base::cinder::api (
   include ::tripleo::profile::base::cinder
 
   if $step >= 4 or ($step >= 3 and $sync_db) {
-    include ::cinder::api
+    class { '::cinder::api':
+      service_name => 'httpd'
+    }
+    include ::cinder::wsgi::apache
     include ::cinder::ceilometer
     include ::cinder::glance
   }