From 315fa319630fa22ee9e31a058a2a17376b5f1ea3 Mon Sep 17 00:00:00 2001 From: Emilien Macchi Date: Wed, 13 Jul 2016 11:29:43 -0400 Subject: Migrate Puppet Hieradata to composable services Migrate puppet/hieradata/*.yaml parameters to puppet/services/*.yaml except for some services that are not composable yet. Co-Authored-By: Juan Antonio Osorio Robles Change-Id: I7e5f8b18ee9aa63a1dffc6facaf88315b07d5fd7 --- puppet/services/cinder-api.yaml | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'puppet/services/cinder-api.yaml') diff --git a/puppet/services/cinder-api.yaml b/puppet/services/cinder-api.yaml index 0cefb380..d93183ef 100644 --- a/puppet/services/cinder-api.yaml +++ b/puppet/services/cinder-api.yaml @@ -37,6 +37,13 @@ outputs: - cinder::api::auth_uri: {get_param: [EndpointMap, KeystoneInternal, uri]} cinder::api::identity_uri: {get_param: [EndpointMap, KeystoneAdmin, uri_no_suffix]} cinder::api::keystone_password: {get_param: CinderPassword} + cinder::api::keystone_tenant: 'service' + cinder::api::enable_proxy_headers_parsing: true + cinder::api::nova_catalog_info: 'compute:Compute Service:internalURL' + # TODO(emilien) move it to puppet-cinder + cinder::config: + DEFAULT/swift_catalog_info: + value: 'object-store:swift:internalURL' 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: -- cgit 1.2.3-korg