From 85df73d23915e29fbffed479e128c30c951b76f0 Mon Sep 17 00:00:00 2001 From: Saravanan KR Date: Wed, 7 Sep 2016 16:19:51 +0530 Subject: 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 --- puppet/services/neutron-ovs-agent.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'puppet/services/neutron-ovs-agent.yaml') diff --git a/puppet/services/neutron-ovs-agent.yaml b/puppet/services/neutron-ovs-agent.yaml index 36b609fc..d060d180 100644 --- a/puppet/services/neutron-ovs-agent.yaml +++ b/puppet/services/neutron-ovs-agent.yaml @@ -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: -- cgit 1.2.3-korg