Fix service config files having wrong map_merge format
map_merge in heat templates should start with hypen for each map group, few templates are missing the hypen for the second map group, which is added in this patch Closes-Bug: #1621008 Change-Id: I307fdd7afc374cce46d6e378594f1b688b9fd4f6
This commit is contained in:
parent
2932988126
commit
85df73d239
|
@ -75,7 +75,7 @@ outputs:
|
|||
config_settings:
|
||||
map_merge:
|
||||
- get_attr: [NeutronBase, role_data, config_settings]
|
||||
neutron::server::database_connection:
|
||||
- neutron::server::database_connection:
|
||||
list_join:
|
||||
- ''
|
||||
- - {get_param: [EndpointMap, MysqlInternal, protocol]}
|
||||
|
|
|
@ -75,7 +75,7 @@ outputs:
|
|||
config_settings:
|
||||
map_merge:
|
||||
- get_attr: [NeutronBase, role_data, config_settings]
|
||||
neutron::agents::ml2::ovs::l2_population: {get_param: NeutronEnableL2Pop}
|
||||
- neutron::agents::ml2::ovs::l2_population: {get_param: NeutronEnableL2Pop}
|
||||
neutron::agents::ml2::ovs::enable_distributed_routing: {get_param: NeutronEnableDVR}
|
||||
neutron::agents::ml2::ovs::arp_responder: {get_param: NeutronEnableARPResponder}
|
||||
neutron::agents::ml2::ovs::bridge_mappings:
|
||||
|
|
|
@ -65,7 +65,7 @@ outputs:
|
|||
config_settings:
|
||||
map_merge:
|
||||
- get_attr: [NeutronOvsAgent, role_data, config_settings]
|
||||
neutron::agents::ml2::ovs::enable_dpdk: true
|
||||
- neutron::agents::ml2::ovs::enable_dpdk: true
|
||||
neutron::agents::ml2::ovs::datapath_type: {get_param: NeutronDatapathType}
|
||||
neutron::agents::ml2::ovs::vhostuser_socket_dir: {get_param: NeutronVhostuserSocketDir}
|
||||
vswitch::dpdk::core_list: {get_param: NeutronDpdkCoreList}
|
||||
|
|
Loading…
Reference in New Issue