From: Jenkins <jenkins@review.openstack.org>
Date: Thu, 18 Feb 2016 19:03:29 +0000 (+0000)
Subject: Merge "Enable the ML2 port security extension driver by default"
X-Git-Tag: opnfv-6.0.0~2176
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=c660cba4f9d762a45fd6c2be24b832dff32b65b2;p=apex-tripleo-heat-templates.git

Merge "Enable the ML2 port security extension driver by default"
---

c660cba4f9d762a45fd6c2be24b832dff32b65b2
diff --cc puppet/controller.yaml
index 98d71c13,c2ab163c..33411e32
--- a/puppet/controller.yaml
+++ b/puppet/controller.yaml
@@@ -507,10 -498,10 +507,10 @@@ parameters
      description: |
          Comma-separated list of <vni_min>:<vni_max> tuples enumerating ranges
          of VXLAN VNI IDs that are available for tenant network allocation
 -    default: ["1:1000", ]
 +    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