diff options
author | Jenkins <jenkins@review.openstack.org> | 2016-12-01 13:01:14 +0000 |
---|---|---|
committer | Gerrit Code Review <review@openstack.org> | 2016-12-01 13:01:14 +0000 |
commit | ea3ace78398015578de77be5a782dfa6176decb7 (patch) | |
tree | 9806ff6109463e8c5bcfcefe26052cf5a6fd85da /puppet/services/neutron-ovs-agent.yaml | |
parent | 096259f7140ec8476fcbb7605c90155079b0c6bc (diff) | |
parent | 787685101179f13f6074901070cf307bd9bb0731 (diff) |
Merge "Hiera optimization: use a new hiera hook"
Diffstat (limited to 'puppet/services/neutron-ovs-agent.yaml')
-rw-r--r-- | puppet/services/neutron-ovs-agent.yaml | 18 |
1 files changed, 3 insertions, 15 deletions
diff --git a/puppet/services/neutron-ovs-agent.yaml b/puppet/services/neutron-ovs-agent.yaml index cca0deee..e2b90b7b 100644 --- a/puppet/services/neutron-ovs-agent.yaml +++ b/puppet/services/neutron-ovs-agent.yaml @@ -94,21 +94,9 @@ outputs: - 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: - str_replace: - template: MAPPINGS - params: - MAPPINGS: {get_param: NeutronBridgeMappings} - neutron::agents::ml2::ovs::tunnel_types: - str_replace: - template: TYPES - params: - TYPES: {get_param: NeutronTunnelTypes} - neutron::agents::ml2::ovs::extensions: - str_replace: - template: AGENT_EXTENSIONS - params: - AGENT_EXTENSIONS: {get_param: NeutronAgentExtensions} + neutron::agents::ml2::ovs::bridge_mappings: {get_param: NeutronBridgeMappings} + neutron::agents::ml2::ovs::tunnel_types: {get_param: NeutronTunnelTypes} + neutron::agents::ml2::ovs::extensions: {get_param: NeutronAgentExtensions} # NOTE: bind IP is found in Heat replacing the network name with the # local node IP for the given network; replacement examples # (eg. for internal_api): |