aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPradeep Kilambi <pkilambi@redhat.com>2016-07-20 10:12:17 -0400
committerPradeep Kilambi <pkilambi@redhat.com>2016-07-20 10:12:17 -0400
commit7d64828ff2a05be8b0e175bcc79df21d08e4cf2a (patch)
tree0486b68dcbdc57cf057a4658c544711433f0e82f
parent970fcfcb58b2d0d26a39c2d9deab3a0301eb65ca (diff)
Fix ceilometer auth url for compute
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: If672b78b8ce9addf831f5b72a702447e1422f30e
-rw-r--r--puppet/compute.yaml2
1 files changed, 1 insertions, 1 deletions
diff --git a/puppet/compute.yaml b/puppet/compute.yaml
index 8de9a19c..d4fdea3d 100644
--- a/puppet/compute.yaml
+++ b/puppet/compute.yaml
@@ -485,7 +485,7 @@ resources:
upgrade_level_nova_compute: {get_param: UpgradeLevelNovaCompute}
ceilometer_metering_secret: {get_param: CeilometerMeteringSecret}
ceilometer_password: {get_param: CeilometerPassword}
- ceilometer_agent_auth_url: {get_param: [EndpointMap, KeystoneInternal, uri]}
+ ceilometer_agent_auth_url: {get_param: [EndpointMap, KeystoneInternal, uri_no_suffix]}
glance_api_servers: {get_param: [EndpointMap, GlanceInternal, uri]}
neutron_local_ip: {get_attr: [NetIpMap, net_ip_map, {get_param: [ServiceNetMap, NeutronTenantNetwork]}]}
neutron_password: {get_param: NeutronPassword}