diff options
| author |   Dan Prince <dprince@redhat.com> | 2016-01-18 08:48:04 -0500 |
|---|---|---|
| committer | Dan Prince <dprince@redhat.com> | 2016-01-22 10:30:42 -0500 |
| commit | dced4001f2c1ba52a42f38bab43bc8e275f4e9fc (patch) | |
| tree | 3075b459f29aee4b75deb8fed98c581f8c81b033 /puppet/manifests | |
| parent | 7c09ccf874d33dddae6597109102a11f14fcf92e (diff) | |
puppet: allow config of ad-hoc Cinder settings
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
Diffstat (limited to 'puppet/manifests')
| -rw-r--r-- | puppet/manifests/overcloud_controller.pp | 1 | ||||
| -rw-r--r-- | puppet/manifests/overcloud_controller_pacemaker.pp | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/puppet/manifests/overcloud_controller.pp b/puppet/manifests/overcloud_controller.pp index 503fbd74..5eb924ef 100644 --- 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 d358a93b..1f3962f2 100644 --- 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, |