openstack/ironic
Code Issues Proposed changes

Remove unnecessary option from plugin settings

Browse Source 
The setting of Q_USE_PROVIDERNET_FOR_PUBLIC was added to
multitenancy job in project-config commit
7d1e2127a2b055640d90808347ae5b133df83847, so no need to set it in
the plugin settings anymore.

Multitenancy devstack setup docs are updated too.

Change-Id: I165bfc8051b9cf3fc80f299c8215712089003f3a
This commit is contained in:
Vladyslav Drok 2016-09-23 16:54:15 +03:00
parent 8698c3e98a
commit 63b76e8ad1
2 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
devstack/settings
View File

@ -1,10 +1,4 @@
enable_service ironic ir-api ir-cond
# Neutron public network type was changed to flat by default recently:
# https://review.openstack.org/#/c/346282/
# TODO(vsaienko) remove once ironic-multitenant job variable and ironic
# developer documentation are updated.
Q_USE_PROVIDERNET_FOR_PUBLIC=False
# TODO(jroll) this hacks around a bug, remove when fixed in devstack
# https://bugs.launchpad.net/devstack/+bug/1629133
SUBNETPOOL_PREFIX_V4=$FIXED_RANGE

3
doc/source/dev/ironic-multitenant-networking.rst
View File

@ -49,6 +49,9 @@ configured in Neutron.
ENABLE_TENANT_VLANS=True
Q_ML2_TENANT_NETWORK_TYPE=vlan
TENANT_VLAN_RANGE=100:150
# Neutron public network type was changed to flat by default
# in neutron commit 1554adef26bd3bd184ddab668660428bdf392232
Q_USE_PROVIDERNET_FOR_PUBLIC=False
# Credentials
ADMIN_PASSWORD=password