summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-02-18 19:03:29 +0000
committerGerrit Code Review <review@openstack.org>2016-02-18 19:03:29 +0000
commitc660cba4f9d762a45fd6c2be24b832dff32b65b2 (patch)
treec6b8e90da7ce5ec7628628b6b52608436fb69e55
parentf06b99d389ff731e3098a542d6bbbce0914d1c9d (diff)
parentd9fa3428fd4a794bddff68960c8748642017f7e4 (diff)
Merge "Enable the ML2 port security extension driver by default"
-rw-r--r--overcloud.yaml2
-rw-r--r--puppet/controller.yaml2
2 files changed, 2 insertions, 2 deletions
diff --git a/overcloud.yaml b/overcloud.yaml
index c2a47b8d..e1f7b4b5 100644
--- a/overcloud.yaml
+++ b/overcloud.yaml
@@ -214,7 +214,7 @@ parameters:
The mechanism drivers for the Neutron tenant network.
type: comma_delimited_list
NeutronPluginExtensions:
- default: "qos"
+ default: "qos,port_security"
description: |
Comma-separated list of extensions enabled for the Neutron plugin.
type: comma_delimited_list
diff --git a/puppet/controller.yaml b/puppet/controller.yaml
index 98d71c13..33411e32 100644
--- a/puppet/controller.yaml
+++ b/puppet/controller.yaml
@@ -510,7 +510,7 @@ parameters:
default: ["1:4094", ]
type: comma_delimited_list
NeutronPluginExtensions:
- default: "qos"
+ default: "qos,port_security"
description: |
Comma-separated list of extensions enabled for the Neutron plugin.
type: comma_delimited_list