openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Set project name for nova -> neutron notifications 

This is a liberty only patch. It's a partial backport of
Ic3a329354d0ed071363183b5e06c0a42d2dd84ad, except in liberty we still
need the /v2.0 suffix on the end of auth_url in the [neutron] section in
nova.conf, so we can't backport that whole patch.

Change-Id: I317a51a12f6290a5605cf8be60d1e118cb7fb29d
This commit is contained in:
James Slagle 2016-02-26 14:27:25 -05:00
parent 082a1da7de
commit 72e9fdb636
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
puppet/controller.yaml
View File

@ -1066,6 +1066,7 @@ resources:
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_uri_no_suffix: { 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}
@ -1401,8 +1402,9 @@ resources:
neutron::keystone::auth::password: {get_input: neutron_password }
neutron::keystone::auth::region: {get_input: keystone_region}
neutron::server::notifications::nova_url: {get_input: nova_internal_url}
neutron::server::notifications::auth_url: {get_input: neutron_admin_auth_url}
neutron::server::notifications::auth_url: {get_input: neutron_admin_auth_url_uri_no_suffix}
neutron::server::notifications::tenant_name: 'service'
neutron::server::notifications::project_name: 'service'
neutron::server::notifications::password: {get_input: nova_password}
# Ceilometer