From: Juan Antonio Osorio Robles <jaosorior@redhat.com>
Date: Sat, 16 Jan 2016 11:38:00 +0000 (+0200)
Subject: Enable SSL middleware for cinder
X-Git-Tag: opnfv-6.0.0~2190^2
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=6deccde41576341ae91e07b8ad837bfafdaa35e7;p=apex-tripleo-heat-templates.git

Enable SSL middleware for cinder

Change-Id: Ifd750e634812dae2b7945cbe2f35f98d8a82695e
Depends-On: If88dcdf9f4905e2a792b2fdc656eab51c85f637e
---

diff --git a/puppet/manifests/overcloud_controller.pp b/puppet/manifests/overcloud_controller.pp
index 70aebddd..3133a051 100644
--- a/puppet/manifests/overcloud_controller.pp
+++ b/puppet/manifests/overcloud_controller.pp
@@ -363,6 +363,7 @@ if hiera('step') >= 3 {
 
   include ::cinder
   include ::cinder::config
+  include ::tripleo::ssl::cinder_config
   include ::cinder::api
   include ::cinder::glance
   include ::cinder::scheduler
diff --git a/puppet/manifests/overcloud_controller_pacemaker.pp b/puppet/manifests/overcloud_controller_pacemaker.pp
index a9adbd5d..d3c3673c 100644
--- a/puppet/manifests/overcloud_controller_pacemaker.pp
+++ b/puppet/manifests/overcloud_controller_pacemaker.pp
@@ -730,6 +730,7 @@ if hiera('step') >= 3 {
 
   include ::cinder
   include ::cinder::config
+  include ::tripleo::ssl::cinder_config
   class { '::cinder::api':
     sync_db        => $sync_db,
     manage_service => false,