openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Merge "Fix service config files having wrong map_merge format"

This commit is contained in:
Jenkins 2016-09-12 09:39:05 +00:00 committed by Gerrit Code Review
parent 692e9e6a7c 85df73d239
commit ede33f67b9
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
puppet/services/neutron-api.yaml
View File

@ -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]}

2
puppet/services/neutron-ovs-agent.yaml
View File

@ -83,7 +83,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:

2
puppet/services/neutron-ovs-dpdk-agent.yaml
View File

@ -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}