diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2016-09-12 09:39:05 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2016-09-12 09:39:05 +0000 |
| commit | ede33f67b9d35e13b0341732852f76e84e115245 (patch) | |
| tree | 2df670e8c916e24c3029187bfbd5626c457c34e7 /puppet/services/neutron-ovs-agent.yaml | |
| parent | 692e9e6a7c0a661763c716837cdf4e6c4a182fdb (diff) | |
| parent | 85df73d23915e29fbffed479e128c30c951b76f0 (diff) | |
Merge "Fix service config files having wrong map_merge format"
Diffstat (limited to 'puppet/services/neutron-ovs-agent.yaml')
| -rw-r--r-- | puppet/services/neutron-ovs-agent.yaml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/puppet/services/neutron-ovs-agent.yaml b/puppet/services/neutron-ovs-agent.yaml index 080cd1c3..ade322ed 100644 --- a/puppet/services/neutron-ovs-agent.yaml +++ b/puppet/services/neutron-ovs-agent.yaml @@ -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: |