summaryrefslogtreecommitdiff
path: root/etc/neutron.conf
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2015-11-11 08:42:32 +0000
committerGerrit Code Review <review@openstack.org>2015-11-11 08:42:32 +0000
commit87ce4868caea9b7f1dd79f575004ee152ffa7eb0 (patch)
tree2e15540540de85e2cab129744b6c85a53579f731 /etc/neutron.conf
parent1a776b361519557d09d37bee322c65974be16dce (diff)
parenta3113c56c2aee11755890e22026423cc5b43c811 (diff)
Merge "Add new config option for IPv6 Prefix Delegation"
Diffstat (limited to 'etc/neutron.conf')
-rw-r--r--etc/neutron.conf12
1 files changed, 9 insertions, 3 deletions
diff --git a/etc/neutron.conf b/etc/neutron.conf
index 70173de..3140c2c 100644
--- a/etc/neutron.conf
+++ b/etc/neutron.conf
@@ -166,11 +166,17 @@
166 166
167# Default Subnet Pool to be used for IPv6 subnet-allocation. 167# 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 168# Specifies by UUID the pool to be used in case of subnet-create being
169# called without a subnet-pool ID. Set to "prefix_delegation" 169# called without a subnet-pool ID. See the description for
170# to enable IPv6 Prefix Delegation in a PD-capable environment. 170# default_ipv4_subnet_pool for more information.
171# See the description for default_ipv4_subnet_pool for more information.
172# default_ipv6_subnet_pool = 171# default_ipv6_subnet_pool =
173 172
173# Set to True to enable IPv6 Prefix Delegation for subnet-allocation in a
174# PD-capable environment. Users making subnet-create requests for v6 subnets
175# without providing a cidr or subnetpool ID will be given a cidr via the Prefix
176# Delegation mechanism. Note that enabling PD will override the behavior of
177# the default IPv6 subnetpool.
178# ipv6_pd_enabled =
179
174# =========== items for MTU selection and advertisement ============= 180# =========== items for MTU selection and advertisement =============
175# Advertise MTU. If True, effort is made to advertise MTU 181# Advertise MTU. If True, effort is made to advertise MTU
176# settings to VMs via network methods (ie. DHCP and RA MTU options) 182# settings to VMs via network methods (ie. DHCP and RA MTU options)