summaryrefslogtreecommitdiffstats
path: root/puppet/services/neutron-ovs-agent.yaml
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-08-03 14:19:44 +0000
committerGerrit Code Review <review@openstack.org>2017-08-03 14:19:44 +0000
commitb3b9e953a9140fa0a2450dc333a5cbb7456c4bfa (patch)
treea6e41714054a8b694b2bb4d5e0f1db745a6ea55c /puppet/services/neutron-ovs-agent.yaml
parent2cf0a6843a1df7fb4386c96c7e782609a52e98e3 (diff)
parentc05e72cd720b16383f5e4be8b774270f8fce6ca5 (diff)
Merge "Make many networking parameters consistent"
Diffstat (limited to 'puppet/services/neutron-ovs-agent.yaml')
-rw-r--r--puppet/services/neutron-ovs-agent.yaml6
1 files changed, 2 insertions, 4 deletions
diff --git a/puppet/services/neutron-ovs-agent.yaml b/puppet/services/neutron-ovs-agent.yaml
index 1d4029cf..7894f78b 100644
--- a/puppet/services/neutron-ovs-agent.yaml
+++ b/puppet/services/neutron-ovs-agent.yaml
@@ -32,8 +32,7 @@ parameters:
type: json
NeutronEnableL2Pop:
type: string
- description: >
- Enable/disable the L2 population feature in the Neutron agents.
+ description: Enable/disable the L2 population feature in the Neutron agents.
default: "False"
NeutronBridgeMappings:
description: >
@@ -47,8 +46,7 @@ parameters:
default: "datacentre:br-ex"
NeutronTunnelTypes:
default: 'vxlan'
- description: |
- The tunnel types for the Neutron tenant network.
+ description: The tunnel types for the Neutron tenant network.
type: comma_delimited_list
NeutronAgentExtensions:
default: "qos"