openstack/ironic
Code Issues Proposed changes

Remove grenade config workaround

Browse Source 
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
This commit is contained in:
Vasyl Saienko 2016-12-16 14:25:50 +02:00
parent e65b191107
commit 318b7638d9
1 changed files with 0 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
devstack/upgrade/resources.sh
View File

@ -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