From 26ff9383c017e380e8260bffe5d361c1c3feb688 Mon Sep 17 00:00:00 2001 From: Goutham Pacha Ravi Date: Mon, 4 May 2020 22:25:48 -0700 Subject: [PATCH] [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 (cherry picked from commit 47c8debfebb0e3cb6cf1be9a813daad1cd627a99) (cherry picked from commit 294ba7c396ab67160194758c93a3fc69004cea16) (cherry picked from commit 82823b03456603a240b7e1c52bd30a33ccebe014) --- devstack/plugin.sh | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/devstack/plugin.sh b/devstack/plugin.sh index 73d069e7c1..b5ff57ffa0 100755 --- a/devstack/plugin.sh +++ b/devstack/plugin.sh @@ -917,6 +917,14 @@ function install_manila_tempest_plugin { # update_tempest - Function used for updating Tempest config if Tempest service enabled function update_tempest { 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} ADMIN_TENANT_NAME=${ADMIN_TENANT_NAME:-"admin"} ADMIN_DOMAIN_NAME=${ADMIN_DOMAIN_NAME:-"Default"}