Code Review / apex-tripleo-heat-templates.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | patch | inline | side by side (parent: 7c09ccf)
puppet: allow config of ad-hoc Cinder settings
authorDan Prince <dprince@redhat.com>
Mon, 18 Jan 2016 13:48:04 +0000 (08:48 -0500)
committerDan Prince <dprince@redhat.com>
Fri, 22 Jan 2016 15:30:42 +0000 (10:30 -0500)
Including ::cinder::config on controller, and volume roles
will allow ad-hoc (non-puppet managed) settings to be
made in the cinder.conf using Hiera.

Change-Id: I519aff02e3cfb7fbf57e89c7a139564df42f8967

puppet/manifests/overcloud_controller.pp patch | blob | history
puppet/manifests/overcloud_controller_pacemaker.pp patch | blob | history

diff --git a/puppet/manifests/overcloud_controller.pp b/puppet/manifests/overcloud_controller.pp
index 503fbd7..5eb924e 100644 (file)
--- a/puppet/manifests/overcloud_controller.pp
+++ b/puppet/manifests/overcloud_controller.pp
@@ -361,6 +361,7 @@ if hiera('step') >= 3 {
   }
 
   include ::cinder
+  include ::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 d358a93..1f3962f 100644 (file)
--- a/puppet/manifests/overcloud_controller_pacemaker.pp
+++ b/puppet/manifests/overcloud_controller_pacemaker.pp
@@ -728,6 +728,7 @@ if hiera('step') >= 3 {
   }
 
   include ::cinder
+  include ::cinder::config
   class { '::cinder::api':
     sync_db        => $sync_db,
     manage_service => false,