summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-01-20 18:45:45 +0000
committerGerrit Code Review <review@openstack.org>2017-01-20 18:45:45 +0000
commit36d493c7deedc4d8792d03069048ceaf776ef26e (patch)
tree5f25a805f82122aab3d444b2731ddb27638a81e3
parent9a604044c1911bd4e20a7ccc413176d476cb1f3a (diff)
parent2254d38f255f47be9c0208bb8b87da667d3c20fb (diff)
Merge "cinder: move glance params into base"
-rw-r--r--puppet/services/cinder-api.yaml2
-rw-r--r--puppet/services/cinder-base.yaml1
2 files changed, 3 insertions, 0 deletions
diff --git a/puppet/services/cinder-api.yaml b/puppet/services/cinder-api.yaml
index 963ebd63..b32c8185 100644
--- a/puppet/services/cinder-api.yaml
+++ b/puppet/services/cinder-api.yaml
@@ -91,6 +91,8 @@ outputs:
cinder::config:
DEFAULT/swift_catalog_info:
value: 'object-store:swift:internalURL'
+ # TODO(emilien) remove the next line when https://review.openstack.org/422915
+ # is merged.
cinder::glance::glance_api_servers: {get_param: [EndpointMap, GlanceInternal, uri]}
tripleo::profile::base::cinder::cinder_enable_db_purge: {get_param: CinderEnableDBPurge}
tripleo.cinder_api.firewall_rules:
diff --git a/puppet/services/cinder-base.yaml b/puppet/services/cinder-base.yaml
index 91c9ff5e..a5d7fcf1 100644
--- a/puppet/services/cinder-base.yaml
+++ b/puppet/services/cinder-base.yaml
@@ -119,3 +119,4 @@ outputs:
cinder::cron::db_purge::user: {get_param: CinderCronDbPurgeUser}
cinder::cron::db_purge::age: {get_param: CinderCronDbPurgeAge}
cinder::cron::db_purge::destination: {get_param: CinderCronDbPurgeDestination}
+ cinder::glance::glance_api_servers: {get_param: [EndpointMap, GlanceInternal, uri]}