diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2016-08-12 15:48:26 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2016-08-12 15:48:26 +0000 |
| commit | 46e7d8110fc3a09d8e6b8c30e1dd1f45519f2c8f (patch) | |
| tree | 8338fca52a6a0d9315bc78de261d0ad31fd9cff3 /puppet/controller.yaml | |
| parent | 0eb70014a339eddc6be9257a70d6ad0547e31c9a (diff) | |
| parent | ba1fb563d10ae527d19663b94c76216fbf7e8591 (diff) | |
Merge "Move gnocchi's kestone::auth parameters to API profile"
Diffstat (limited to 'puppet/controller.yaml')
| -rw-r--r-- | puppet/controller.yaml | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/puppet/controller.yaml b/puppet/controller.yaml index 779aa8a4..182b46ba 100644 --- a/puppet/controller.yaml +++ b/puppet/controller.yaml @@ -524,9 +524,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} @@ -719,10 +716,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} |