summaryrefslogtreecommitdiffstats
path: root/puppet
diff options
context:
space:
mode:
authorBen Nemec <bnemec@redhat.com>2016-01-18 17:48:52 -0600
committerBen Nemec <bnemec@redhat.com>2016-01-18 17:52:51 -0600
commit56a141cacbbc76bdd909c02e0e670a97676cb217 (patch)
tree0ea259c4a1bb998c7319ef7b572d4e6f6c15df5f /puppet
parentbdfdce52ad08d4ce70e7d4ca61b1c6d8409a8730 (diff)
Fix neutron-nova notifications
In our neutron.conf we configure both keystone v2 and v3 options, which confuses the keystoneclient code responsible for deciding which to use. For whatever reason, having it talk to the unversioned keystone endpoint and letting the client decide which version that way makes it happy. Except that we write a wrong value for project_name, which makes it unhappy again. This change fixes both of those issues, which allows notifications to work again. Change-Id: Ic3a329354d0ed071363183b5e06c0a42d2dd84ad Closes-Bug: 1519525
Diffstat (limited to 'puppet')
-rw-r--r--puppet/controller.yaml3
1 files changed, 2 insertions, 1 deletions
diff --git a/puppet/controller.yaml b/puppet/controller.yaml
index f5378221..49c095a0 100644
--- a/puppet/controller.yaml
+++ b/puppet/controller.yaml
@@ -1075,7 +1075,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}
@@ -1430,6 +1430,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