From 3da37c8bc5f529a42b7b72f29fdb9a760c32f999 Mon Sep 17 00:00:00 2001 From: Dan Prince Date: Mon, 18 Jan 2016 08:59:01 -0500 Subject: puppet: allow config of ad-hoc Glance settings Including ::glance::config on glance roles will allow ad-hoc (non-puppet managed) settings to be made in the glance config files using Hiera. Change-Id: I7c86ae0e8f1a0a2b46d526598964454cb80319a6 --- puppet/manifests/overcloud_controller.pp | 1 + puppet/manifests/overcloud_controller_pacemaker.pp | 1 + 2 files changed, 2 insertions(+) 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, -- cgit 1.2.3-korg