diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2016-06-29 18:13:08 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2016-06-29 18:13:08 +0000 |
| commit | 463333ccc7a33db21157db49b69c37a4b04593d9 (patch) | |
| tree | d70cd11f40be2cd2557709e86ad13c589fc27bec | |
| parent | 52de7ade31dc033424d03a0f5f088873cd70c55c (diff) | |
| parent | 09944ed66fda0f808b3eda3de3496a1e7608265d (diff) | |
Merge "Fix ceilometer auth url"
| -rw-r--r-- | puppet/controller.yaml | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/puppet/controller.yaml b/puppet/controller.yaml index 132f0759..6e703b93 100644 --- a/puppet/controller.yaml +++ b/puppet/controller.yaml @@ -696,6 +696,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} @@ -934,7 +935,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} |