diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2016-01-23 17:31:43 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2016-01-23 17:31:43 +0000 |
| commit | 5e695df655137b31a2536e80080c67dbf9a94415 (patch) | |
| tree | 0ed0b1b0664d0466475f79bb99d06cee48bf10a3 | |
| parent | 56bc8272b3c07142ff1aa47685de9ec7ce2ffe89 (diff) | |
| parent | dced4001f2c1ba52a42f38bab43bc8e275f4e9fc (diff) | |
Merge "puppet: allow config of ad-hoc Cinder settings"
| -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, |