From 09944ed66fda0f808b3eda3de3496a1e7608265d Mon Sep 17 00:00:00 2001 From: Pradeep Kilambi Date: Fri, 24 Jun 2016 10:59:46 -0400 Subject: Fix ceilometer auth url Due to a recent change introduced in puppet ceilometer[1] ceilometer auth type defaults to password type and v2 auth_url doesnt work with domain. This fixes the url to not include suffix. [1] https://review.openstack.org/#/c/320454/ Change-Id: Ibce716825c95e36a942203be2c67ea0da79503f2 --- puppet/controller.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'puppet') diff --git a/puppet/controller.yaml b/puppet/controller.yaml index ae1ef49a..6386299d 100644 --- a/puppet/controller.yaml +++ b/puppet/controller.yaml @@ -705,6 +705,7 @@ resources: ceilometer_public_url: {get_param: [EndpointMap, CeilometerPublic, uri]} ceilometer_internal_url: {get_param: [EndpointMap, CeilometerInternal, uri]} ceilometer_admin_url: {get_param: [EndpointMap, CeilometerAdmin, uri]} + ceilometer_agent_auth_url: {get_param: [EndpointMap, KeystoneInternal, uri_no_suffix]} snmpd_readonly_user_name: {get_param: SnmpdReadonlyUserName} snmpd_readonly_user_password: {get_param: SnmpdReadonlyUserPassword} nova_enable_db_purge: {get_param: NovaEnableDBPurge} @@ -946,7 +947,7 @@ resources: ceilometer::api::auth_uri: {get_input: keystone_auth_uri} ceilometer::api::identity_uri: {get_input: keystone_identity_uri} ceilometer::agent::auth::auth_password: {get_input: ceilometer_password} - ceilometer::agent::auth::auth_url: {get_input: keystone_auth_uri} + ceilometer::agent::auth::auth_url: {get_input: ceilometer_agent_auth_url} ceilometer::agent::central::coordination_url: {get_input: ceilometer_coordination_url} ceilometer::agent::notification::store_events: {get_input: ceilometer_store_events} ceilometer::db::mysql::password: {get_input: ceilometer_password} -- cgit 1.2.3-korg