diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2016-08-15 14:59:03 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2016-08-15 14:59:03 +0000 |
| commit | 6e59141e64ce862c831cbf253f2e8eb81b491461 (patch) | |
| tree | 45ca55e295ca8f422674b7d84a17217e6b610f6a /puppet | |
| parent | 443f641767297d682f34a7427bb7507779373ff5 (diff) | |
| parent | ed6409f7561d8612e216de93de896b9cc78524a6 (diff) | |
Merge "Remove NeutronEnableTunnelling from templates"
Diffstat (limited to 'puppet')
| -rw-r--r-- | puppet/services/neutron-ovs-agent.yaml | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/puppet/services/neutron-ovs-agent.yaml b/puppet/services/neutron-ovs-agent.yaml index 7a97cd84..d52b8a26 100644 --- a/puppet/services/neutron-ovs-agent.yaml +++ b/puppet/services/neutron-ovs-agent.yaml @@ -9,9 +9,6 @@ parameters: description: Mapping of service endpoint -> protocol. Typically set via parameter_defaults in the resource registry. type: json - NeutronEnableTunnelling: - type: string - default: "True" NeutronEnableL2Pop: type: string description: > @@ -56,7 +53,6 @@ outputs: config_settings: map_merge: - get_attr: [NeutronBase, role_data, config_settings] - neutron::agents::ml2::ovs::enable_tunneling: {get_param: NeutronEnableTunnelling} neutron::agents::ml2::ovs::l2_population: {get_param: NeutronEnableL2Pop} neutron::agents::ml2::ovs::enable_distributed_routing: {get_param: NeutronEnableDVR} neutron::agents::ml2::ovs::bridge_mappings: |