From 63b76e8ad19bc04ffbd76a79ca6873c0a6d5ee84 Mon Sep 17 00:00:00 2001 From: Vladyslav Drok Date: Fri, 23 Sep 2016 16:54:15 +0300 Subject: [PATCH] Remove unnecessary option from plugin settings 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 --- devstack/settings | 6 ------ doc/source/dev/ironic-multitenant-networking.rst | 3 +++ 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/devstack/settings b/devstack/settings index 11be91e05d..f9ad9e655f 100644 --- a/devstack/settings +++ b/devstack/settings @@ -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 diff --git a/doc/source/dev/ironic-multitenant-networking.rst b/doc/source/dev/ironic-multitenant-networking.rst index 763657e9b1..afbaa8ce86 100644 --- a/doc/source/dev/ironic-multitenant-networking.rst +++ b/doc/source/dev/ironic-multitenant-networking.rst @@ -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