aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEmilien Macchi <emilien@redhat.com>2017-01-19 18:42:16 -0500
committerEmilien Macchi <emilien@redhat.com>2017-01-19 18:42:16 -0500
commit2254d38f255f47be9c0208bb8b87da667d3c20fb (patch)
tree1e589ed40e76d0b866128f525d8db06c46ede386
parent6551bec38fccc1b1882ce2e4ce80ef5e6790b726 (diff)
cinder: move glance params into base
glance params are also used by cinder-volume. This patch aims to cinder::glance in common roles for cinder, so we can split cinder and cinder volume. Change-Id: Id81c029318016068481dd614ed62cc4bfaf0f3e8
-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]}