From c923b9c64b2ef08d27a2d4111e7e3108436f579c Mon Sep 17 00:00:00 2001 From: Rabi Mishra Date: Fri, 7 Feb 2020 18:32:21 +0530 Subject: [PATCH] Fix grenade job failure Check if subnet already added to router before adding it. Change-Id: I59903642aee125d3b5cfaa944d12cd3ed7b278b4 --- heat_integrationtests/prepare_test_network.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/heat_integrationtests/prepare_test_network.sh b/heat_integrationtests/prepare_test_network.sh index 4900263828..df78fdcd7b 100755 --- a/heat_integrationtests/prepare_test_network.sh +++ b/heat_integrationtests/prepare_test_network.sh @@ -22,5 +22,5 @@ HEAT_PRIVATE_SUBNET_CIDR=10.0.5.0/24 source $TOP_DIR/openrc demo demo openstack network show heat-net || openstack network create heat-net -openstack subnet show heat-subnet || openstack subnet create heat-subnet --network heat-net --subnet-range $HEAT_PRIVATE_SUBNET_CIDR -openstack router add subnet router1 heat-subnet +subnet_id=$((openstack subnet show heat-subnet || openstack subnet create heat-subnet --network heat-net --subnet-range $HEAT_PRIVATE_SUBNET_CIDR) | grep " id " | awk '{print $4}') +openstack router show router1 -c interfaces_info | grep -q $subnet_id || openstack router add subnet router1 $subnet_id