openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Merge "Fix Placement password hiera is not set for Neutron" into stable/train

This commit is contained in:
Zuul 2020-02-08 05:24:56 +00:00 committed by Gerrit Code Review
parent ab9f1c1a8b 03925f8c91
commit fd3859a0b3
1 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
deployment/neutron/neutron-api-container-puppet.yaml
View File

@ -254,6 +254,14 @@ outputs:
neutron::server::sync_db: true neutron::server::sync_db: true
neutron::server::notifications::region_name: {get_param: KeystoneRegion} neutron::server::notifications::region_name: {get_param: KeystoneRegion}
neutron::server::placement::region_name: {get_param: KeystoneRegion} neutron::server::placement::region_name: {get_param: KeystoneRegion}
neutron::server::placement::password: {get_param: NovaPassword}
neutron::server::placement::www_authenticate_uri: {get_param: [EndpointMap, KeystoneInternal, uri_no_suffix]}
neutron::server::placement::project_domain_name: 'Default'
neutron::server::placement::project_name: 'service'
neutron::server::placement::user_domain_name: 'Default'
neutron::server::placement::username: nova
neutron::server::placement::auth_url: {get_param: [EndpointMap, KeystoneInternal, uri_no_suffix]}
neutron::server::placement::auth_type: 'password'
tripleo::neutron_api::firewall_rules: tripleo::neutron_api::firewall_rules:
'114 neutron api': '114 neutron api':
dport: dport:
@ -372,16 +380,6 @@ outputs:
neutron::db::mysql::allowed_hosts: neutron::db::mysql::allowed_hosts:
- '%' - '%'
- "%{hiera('mysql_bind_host')}" - "%{hiera('mysql_bind_host')}"
placement:
neutron::server::placement::www_authenticate_uri: {get_param: [EndpointMap, KeystoneInternal, uri_no_suffix]}
neutron::server::placement::project_domain_name: 'Default'
neutron::server::placement::project_name: 'service'
neutron::server::placement::user_domain_name: 'Default'
neutron::server::placement::password: {get_param: NovaPassword}
neutron::server::placement::username: nova
neutron::server::placement::auth_url: {get_param: [EndpointMap, KeystoneInternal, uri_no_suffix]}
neutron::server::placement::auth_type: 'password'
neutron::server::placement::region_name: {get_param: KeystoneRegion}
# BEGIN DOCKER SETTINGS # BEGIN DOCKER SETTINGS
puppet_config: puppet_config:
config_volume: neutron config_volume: neutron