diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2016-01-22 14:08:24 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2016-01-22 14:08:24 +0000 |
| commit | 47b3a088b0c99facdc5b8f389e7046f28073ddc5 (patch) | |
| tree | 1eb74637399759d4dcdddc64e690ec2b6be66e23 | |
| parent | fe2133fa8bfface39bdf132b55b692ac349a85e1 (diff) | |
| parent | aa3dce50ef1ffe8b2edb87cf1bbc9383787f9f93 (diff) | |
Merge "Update VNI and TunnelID ranges."
| -rw-r--r-- | overcloud.yaml | 4 | ||||
| -rw-r--r-- | puppet/compute.yaml | 4 | ||||
| -rw-r--r-- | puppet/controller.yaml | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/overcloud.yaml b/overcloud.yaml index b3978048..56e732ea 100644 --- a/overcloud.yaml +++ b/overcloud.yaml @@ -177,13 +177,13 @@ parameters: description: | Comma-separated list of <tun_min>:<tun_max> tuples enumerating ranges of GRE tunnel IDs that are available for tenant network allocation - default: ["1:1000", ] + default: ["1:4094", ] type: comma_delimited_list NeutronVniRanges: 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 NeutronCorePlugin: default: 'ml2' diff --git a/puppet/compute.yaml b/puppet/compute.yaml index a0af2316..8b2bcd33 100644 --- a/puppet/compute.yaml +++ b/puppet/compute.yaml @@ -127,13 +127,13 @@ parameters: description: | Comma-separated list of <tun_min>:<tun_max> tuples enumerating ranges of GRE tunnel IDs that are available for tenant network allocation - default: ["1:1000", ] + default: ["1:4094", ] type: comma_delimited_list NeutronVniRanges: 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 NeutronPublicInterfaceRawDevice: default: '' diff --git a/puppet/controller.yaml b/puppet/controller.yaml index d0394757..ea19c711 100644 --- a/puppet/controller.yaml +++ b/puppet/controller.yaml @@ -501,13 +501,13 @@ parameters: description: | Comma-separated list of <tun_min>:<tun_max> tuples enumerating ranges of GRE tunnel IDs that are available for tenant network allocation - default: ["1:1000", ] + default: ["1:4094", ] type: comma_delimited_list NeutronVniRanges: 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" |