Wallaby and before: Fix wrong puppet parameter name
The neutron::agents::ml2::networking_baremetal class does not provide
the user parameter but the username parameter.
Change-Id: I7141dff598b73cbee062e127677880c396680f32
(cherry picked from commit e7f027d33a
)
This commit is contained in:
parent
fe2e8c693d
commit
2397dd095c
|
@ -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
|
||||
|
|
Loading…
Reference in New Issue