openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Merge "Wallaby and before: Fix wrong puppet parameter name" into stable/train

This commit is contained in:
Zuul 2021-10-09 07:44:01 +00:00 committed by Gerrit Code Review
parent be086451f9 c459fb07e2
commit 19249fbe02
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
deployment/ironic/ironic-neutron-agent-container-puppet.yaml
View File

@ -73,13 +73,13 @@ outputs:
config_settings:
map_merge:
- get_attr: [NeutronBase, role_data, config_settings]
- neutron::agents::ml2::networking_baremetal::user: 'ironic'
- neutron::agents::ml2::networking_baremetal::password: {get_param: IronicPassword}
- neutron::agents::ml2::networking_baremetal::auth_url: { get_param: [ EndpointMap, KeystoneInternal, uri_no_suffix ] }
- neutron::agents::ml2::networking_baremetal::project_name: 'service'
- neutron::agents::ml2::networking_baremetal::user_domain_name: 'Default'
- neutron::agents::ml2::networking_baremetal::project_domain_name: 'Default'
- neutron::agents::ml2::networking_baremetal::region_name: {get_param: KeystoneRegion}
- neutron::agents::ml2::networking_baremetal::username: 'ironic'
neutron::agents::ml2::networking_baremetal::password: {get_param: IronicPassword}
neutron::agents::ml2::networking_baremetal::auth_url: { get_param: [ EndpointMap, KeystoneInternal, uri_no_suffix ] }
neutron::agents::ml2::networking_baremetal::project_name: 'service'
neutron::agents::ml2::networking_baremetal::user_domain_name: 'Default'
neutron::agents::ml2::networking_baremetal::project_domain_name: 'Default'
neutron::agents::ml2::networking_baremetal::region_name: {get_param: KeystoneRegion}
- get_attr: [NeutronLogging, config_settings]
puppet_config:
config_volume: neutron