diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2016-01-22 21:56:00 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2016-01-22 21:56:00 +0000 |
| commit | 4e0acc6e50041940a1f38d04d0036dd67bbbeaf3 (patch) | |
| tree | a07c45f6db10f0fe48fa957fa24c20b3e2b9ffd7 | |
| parent | f445a2ebf6e3a553e9339830e658938b65139517 (diff) | |
| parent | 3da37c8bc5f529a42b7b72f29fdb9a760c32f999 (diff) | |
Merge "puppet: allow config of ad-hoc Glance 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 855e872b..fad33ca1 100644 --- a/puppet/manifests/overcloud_controller.pp +++ b/puppet/manifests/overcloud_controller.pp @@ -216,6 +216,7 @@ if hiera('step') >= 3 { # TODO: notifications, scrubber, etc. include ::glance + include ::glance::config class { '::glance::api': known_stores => $glance_store, } diff --git a/puppet/manifests/overcloud_controller_pacemaker.pp b/puppet/manifests/overcloud_controller_pacemaker.pp index c7b24114..01a33f3f 100644 --- a/puppet/manifests/overcloud_controller_pacemaker.pp +++ b/puppet/manifests/overcloud_controller_pacemaker.pp @@ -554,6 +554,7 @@ if hiera('step') >= 3 { # TODO: notifications, scrubber, etc. include ::glance + include ::glance::config class { '::glance::api': known_stores => $glance_store, manage_service => false, |