openstack/tripleo-heat-templates
Code Issues Proposed changes

Merge "cinder: move glance params into base"

Browse Source
This commit is contained in:
Jenkins
2017-01-20 18:45:45 +00:00
committed by Gerrit Code Review
parent 9a604044c1 2254d38f25
commit 36d493c7de
2 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
puppet/services/cinder-api.yaml
View File

@@ -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:

1
puppet/services/cinder-base.yaml
View File

@@ -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]}