[devstack][ci] Set public network ID in tempest.conf
When running IPv6 tests, we disable the creation of
the public network in devstack, and handle it in the
devstack plugin. So, we'll need to configure it
in tempest in the plugin.
Change-Id: Icf5f26397e16d7fbfae77aa246ac5e35581f441e
Signed-off-by: Goutham Pacha Ravi <gouthampravi@gmail.com>
(cherry picked from commit 47c8debfeb
)
This commit is contained in:
parent
653092e583
commit
294ba7c396
|
@ -916,6 +916,14 @@ function install_manila_tempest_plugin {
|
||||||
# update_tempest - Function used for updating Tempest config if Tempest service enabled
|
# update_tempest - Function used for updating Tempest config if Tempest service enabled
|
||||||
function update_tempest {
|
function update_tempest {
|
||||||
if is_service_enabled tempest; then
|
if is_service_enabled tempest; then
|
||||||
|
|
||||||
|
if [[ "$(trueorfalse False MANILA_SETUP_IPV6)" == "True" ]]; then
|
||||||
|
# The public network was created by us, so set it explicitly in
|
||||||
|
# tempest.conf
|
||||||
|
public_net_id=$(openstack network list --name $PUBLIC_NETWORK_NAME -f value -c ID )
|
||||||
|
iniset $TEMPEST_CONFIG network public_network_id $public_net_id
|
||||||
|
fi
|
||||||
|
|
||||||
TEMPEST_CONFIG=${TEMPEST_CONFIG:-$TEMPEST_DIR/etc/tempest.conf}
|
TEMPEST_CONFIG=${TEMPEST_CONFIG:-$TEMPEST_DIR/etc/tempest.conf}
|
||||||
ADMIN_TENANT_NAME=${ADMIN_TENANT_NAME:-"admin"}
|
ADMIN_TENANT_NAME=${ADMIN_TENANT_NAME:-"admin"}
|
||||||
ADMIN_DOMAIN_NAME=${ADMIN_DOMAIN_NAME:-"Default"}
|
ADMIN_DOMAIN_NAME=${ADMIN_DOMAIN_NAME:-"Default"}
|
||||||
|
|
Loading…
Reference in New Issue