summaryrefslogtreecommitdiffstats
path: root/puppet/services
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-09-12 21:05:24 +0000
committerGerrit Code Review <review@openstack.org>2016-09-12 21:05:24 +0000
commit26b56d0e9a76b00b4c87fe394dbdf54fd6a8d3b5 (patch)
tree4fb7d4831bef41ed54a23c12bd8112f3c7e0e50e /puppet/services
parent6c4654b7a269c6a1954b70e7791ac110215ad14f (diff)
parent288088a13319cf486d1f34a11b61843c7cc89d27 (diff)
Merge "Add trunking plugin to list of default ML2 service plugins"
Diffstat (limited to 'puppet/services')
-rw-r--r--puppet/services/neutron-plugin-ml2.yaml2
1 files changed, 1 insertions, 1 deletions
diff --git a/puppet/services/neutron-plugin-ml2.yaml b/puppet/services/neutron-plugin-ml2.yaml
index 5dbae3dc..17e8bca1 100644
--- a/puppet/services/neutron-plugin-ml2.yaml
+++ b/puppet/services/neutron-plugin-ml2.yaml
@@ -33,7 +33,7 @@ parameters:
default: 'datacentre'
description: If set, flat networks to configure in neutron plugins.
NeutronPluginExtensions:
- default: "qos,port_security"
+ default: "qos,port_security,trunk"
description: |
Comma-separated list of extensions enabled for the Neutron plugin.
type: comma_delimited_list