Merge "Update VNI and TunnelID ranges."

diff --cc overcloud.yaml
Simple merge

diff --cc puppet/compute.yaml
Simple merge

diff --cc puppet/controller.yaml
index d039475,d139003..ea19c71
--- 1/puppet/controller.yaml
--- 2/puppet/controller.yaml
+++ b/puppet/controller.yaml
@@@ -507,18 -474,8 +507,18 @@@ 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"
 +    description: |
 +        Comma-separated list of extensions enabled for the Neutron plugin.
 +    type: comma_delimited_list
 +  NeutronAgentExtensions:
 +    default: "qos"
 +    description: |
 +        Comma-separated list of extensions enabled for the Neutron agents.
 +    type: comma_delimited_list
    NovaApiVirtualIP:
      type: string
      default: ''