From: Pradeep Kilambi <pkilambi@redhat.com>
Date: Wed, 20 Jul 2016 14:12:17 +0000 (-0400)
Subject: Fix ceilometer auth url for compute
X-Git-Tag: opnfv-6.0.0~1835^2
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=7d64828ff2a05be8b0e175bcc79df21d08e4cf2a;p=apex-tripleo-heat-templates.git

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
---

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}