summaryrefslogtreecommitdiff
path: root/etc/neutron.conf
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2015-11-13 16:08:38 +0000
committerGerrit Code Review <review@openstack.org>2015-11-13 16:08:38 +0000
commit772b3e3df3b6c1c63a435b3b980903e583ff80db (patch)
treee94fbbdd29e55ac580a55bf7578a0237aa8f9d58 /etc/neutron.conf
parent4c857ebb593c9b5d95b87c12e16e667f9108c7bf (diff)
parent6ee91e56c84ea6e930369f8649f1d2b50096cb80 (diff)
Merge "Replace subnetpool config options with admin-only API"
Diffstat (limited to 'etc/neutron.conf')
-rw-r--r--etc/neutron.conf4
1 files changed, 4 insertions, 0 deletions
diff --git a/etc/neutron.conf b/etc/neutron.conf
index 3140c2c..2745bd5 100644
--- a/etc/neutron.conf
+++ b/etc/neutron.conf
@@ -162,12 +162,16 @@
162# CIDR must be passed to create a subnet and that subnet will not be allocated 162# CIDR must be passed to create a subnet and that subnet will not be allocated
163# from any pool; it will be considered part of the tenant's private address 163# from any pool; it will be considered part of the tenant's private address
164# space. 164# space.
165# This option is deprecated for removal in the N release. Please refrain from
166# using it.
165# default_ipv4_subnet_pool = 167# default_ipv4_subnet_pool =
166 168
167# Default Subnet Pool to be used for IPv6 subnet-allocation. 169# Default Subnet Pool to be used for IPv6 subnet-allocation.
168# Specifies by UUID the pool to be used in case of subnet-create being 170# Specifies by UUID the pool to be used in case of subnet-create being
169# called without a subnet-pool ID. See the description for 171# called without a subnet-pool ID. See the description for
170# default_ipv4_subnet_pool for more information. 172# default_ipv4_subnet_pool for more information.
173# This option is deprecated for removal in the N release. Please refrain from
174# using it.
171# default_ipv6_subnet_pool = 175# default_ipv6_subnet_pool =
172 176
173# Set to True to enable IPv6 Prefix Delegation for subnet-allocation in a 177# Set to True to enable IPv6 Prefix Delegation for subnet-allocation in a