aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-07-20 20:26:18 +0000
committerGerrit Code Review <review@openstack.org>2016-07-20 20:26:18 +0000
commit21d8fc34428425730059567759e123205087b7cb (patch)
treecbcc41f6fa6b0524ecd9d2e7184295671b1b6df1
parent35aceb0876b51fe990e369f900fd2dd3d45e6dfa (diff)
parent7d64828ff2a05be8b0e175bcc79df21d08e4cf2a (diff)
Merge "Fix ceilometer auth url for compute"
-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}