aboutsummaryrefslogtreecommitdiffstats
path: root/puppet/controller.yaml
diff options
context:
space:
mode:
authorJuan Antonio Osorio Robles <jaosorior@redhat.com>2016-08-08 13:40:23 +0300
committerJuan Antonio Osorio Robles <jaosorior@redhat.com>2016-08-09 16:29:07 +0300
commitba1fb563d10ae527d19663b94c76216fbf7e8591 (patch)
tree319e4a03b5dbd980bf57fd600328a00acbf19ec9 /puppet/controller.yaml
parent173ce97b0c404e0dd815b299080fbdc89b680bc9 (diff)
Move gnocchi's kestone::auth parameters to API profile
In the move to composable services, these parameters are not necessary in the controller, but in the profile itself. They are not yet in use but will be used to populate the keystone endpoint. Change-Id: Iab3ab05e16872d94d3b3ab4827e2f87f4970aee3
Diffstat (limited to 'puppet/controller.yaml')
-rw-r--r--puppet/controller.yaml7
1 files changed, 0 insertions, 7 deletions
diff --git a/puppet/controller.yaml b/puppet/controller.yaml
index 93f0e03e..3e12fbb3 100644
--- a/puppet/controller.yaml
+++ b/puppet/controller.yaml
@@ -525,9 +525,6 @@ resources:
- '@'
- {get_param: RedisVirtualIPUri}
- ':6379/'
- gnocchi_internal_url: {get_param: [EndpointMap, GnocchiInternal, uri]}
- gnocchi_public_url: { get_param: [ EndpointMap, GnocchiPublic, uri ] }
- gnocchi_admin_url: { get_param: [ EndpointMap, GnocchiAdmin, uri ] }
nova_enable_db_purge: {get_param: NovaEnableDBPurge}
nova_ipv6: {get_param: NovaIPv6}
corosync_ipv6: {get_param: CorosyncIPv6}
@@ -717,10 +714,6 @@ resources:
gnocchi::api::keystone_auth_uri: {get_input: keystone_auth_uri}
gnocchi::api::keystone_identity_uri: {get_input: keystone_identity_uri}
gnocchi::storage::swift::swift_authurl: {get_input: keystone_auth_uri}
- gnocchi::keystone::auth::public_url: {get_input: gnocchi_public_url }
- gnocchi::keystone::auth::internal_url: {get_input: gnocchi_internal_url }
- gnocchi::keystone::auth::admin_url: {get_input: gnocchi_admin_url }
- gnocchi::keystone::auth::region: {get_input: keystone_region}
# Nova
nova::upgrade_level_compute: {get_input: upgrade_level_nova_compute}