From: Jenkins <jenkins@review.openstack.org>
Date: Fri, 22 Jan 2016 14:08:24 +0000 (+0000)
Subject: Merge "Update VNI and TunnelID ranges."
X-Git-Tag: opnfv-6.0.0~2214
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=47b3a088b0c99facdc5b8f389e7046f28073ddc5;p=apex-tripleo-heat-templates.git

Merge "Update VNI and TunnelID ranges."
---

47b3a088b0c99facdc5b8f389e7046f28073ddc5
diff --cc puppet/controller.yaml
index d0394757,d139003b..ea19c711
--- a/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: ''