Fix ceilometer auth url for compute
authorPradeep Kilambi <pkilambi@redhat.com>
Wed, 20 Jul 2016 14:12:17 +0000 (10:12 -0400)
committerPradeep Kilambi <pkilambi@redhat.com>
Wed, 20 Jul 2016 14:12:17 +0000 (10:12 -0400)
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

puppet/compute.yaml

index 8de9a19..d4fdea3 100644 (file)
@@ -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}