summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJuan Antonio Osorio Robles <jaosorior@redhat.com>2016-01-16 13:38:00 +0200
committerJuan Antonio Osorio Robles <jaosorior@redhat.com>2016-01-25 12:38:59 +0200
commit6deccde41576341ae91e07b8ad837bfafdaa35e7 (patch)
treee63ac646f7884734590a30ba735b884f9fd3150b
parent1d7167e0b70b6d3da195287aff81c191de900ca5 (diff)
Enable SSL middleware for cinder
Change-Id: Ifd750e634812dae2b7945cbe2f35f98d8a82695e Depends-On: If88dcdf9f4905e2a792b2fdc656eab51c85f637e
-rw-r--r--puppet/manifests/overcloud_controller.pp1
-rw-r--r--puppet/manifests/overcloud_controller_pacemaker.pp1
2 files changed, 2 insertions, 0 deletions
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,