From 318b7638d9edabd6a715cf7d73210ead53ac4613 Mon Sep 17 00:00:00 2001 From: Vasyl Saienko Date: Fri, 16 Dec 2016 14:25:50 +0200 Subject: [PATCH] Remove grenade config workaround Starting with Idede322190d57491d4f7e18090aa8c29b5b87353 base and target releases has the same tempest config file. This patch drops setting fixed_network_name in target tempest.conf workaround. Change-Id: I661ace60bf9b4817f73aaccda9c18e24adfc4e56 --- devstack/upgrade/resources.sh | 6 ------ 1 file changed, 6 deletions(-) diff --git a/devstack/upgrade/resources.sh b/devstack/upgrade/resources.sh index 3e2b1efb0d..ef26e67fc7 100755 --- a/devstack/upgrade/resources.sh +++ b/devstack/upgrade/resources.sh @@ -112,12 +112,6 @@ function destroy { neutron router-interface-delete neutron_grenade neutron_grenade || /bin/true neutron router-delete neutron_grenade || /bin/true neutron net-delete neutron_grenade || /bin/true - - # NOTE(vsaienko) fixed_network_name tempest config option setting logic was changed in - # https://review.openstack.org/374311/ and until it is not reverted or - # https://review.openstack.org/380006 is merged we need to set fixed_network_name explicitly. - TEMPEST_CONFIG="$TARGET_RELEASE_DIR/tempest/etc/tempest.conf" - iniset $TEMPEST_CONFIG compute fixed_network_name $PRIVATE_NETWORK_NAME } # Dispatcher