aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-01-19 17:06:34 +0000
committerGerrit Code Review <review@openstack.org>2016-01-19 17:06:34 +0000
commit461e38dda3317bde9ffe7c34916effb0eb823340 (patch)
tree5505092a64e2d0d6afb1ee6bff0fb56d2cda1fc0
parent795e4290dd6b12a8f4b7c6932a3777a036195081 (diff)
parent56a141cacbbc76bdd909c02e0e670a97676cb217 (diff)
Merge "Fix neutron-nova notifications"
-rw-r--r--puppet/controller.yaml3
1 files changed, 2 insertions, 1 deletions
diff --git a/puppet/controller.yaml b/puppet/controller.yaml
index 55c864f2..70145010 100644
--- a/puppet/controller.yaml
+++ b/puppet/controller.yaml
@@ -1077,7 +1077,7 @@ resources:
neutron_internal_url: { get_param: [ EndpointMap, NeutronInternal, uri ] }
neutron_public_url: { get_param: [ EndpointMap, NeutronPublic, uri ] }
neutron_admin_url: { get_param: [ EndpointMap, NeutronAdmin, uri ] }
- neutron_admin_auth_url: { get_param: [ EndpointMap, KeystoneAdmin, uri ] }
+ neutron_admin_auth_url: { get_param: [ EndpointMap, KeystoneAdmin, uri_no_suffix ] }
nova_internal_url: { get_param: [ EndpointMap, NovaInternal, uri ] }
ceilometer_backend: {get_param: CeilometerBackend}
ceilometer_metering_secret: {get_param: CeilometerMeteringSecret}
@@ -1432,6 +1432,7 @@ resources:
neutron::server::notifications::nova_url: {get_input: nova_internal_url}
neutron::server::notifications::auth_url: {get_input: neutron_admin_auth_url}
neutron::server::notifications::tenant_name: 'service'
+ neutron::server::notifications::project_name: 'service'
neutron::server::notifications::password: {get_input: nova_password}
# Ceilometer