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

diff --cc overcloud.yaml
Simple merge

diff --cc puppet/controller.yaml
index 98d71c1,c2ab163..33411e3
--- 1/puppet/controller.yaml
--- 2/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