From 0c922167d8e6a36871b1bcfb2fadee8afdb9a48d Mon Sep 17 00:00:00 2001 From: rabi Date: Thu, 20 Oct 2016 14:56:39 +0530 Subject: [PATCH] Use osc commands for creating neutron resources Now that we've the latest osc is in requirements, we can use it to create the neutron resources. Change-Id: Ic9c590d4a40591d3ab11d19c99536b20618c24e3 --- heat_integrationtests/prepare_test_network.sh | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/heat_integrationtests/prepare_test_network.sh b/heat_integrationtests/prepare_test_network.sh index 6b83920ebe..a69af4ea6b 100755 --- a/heat_integrationtests/prepare_test_network.sh +++ b/heat_integrationtests/prepare_test_network.sh @@ -21,8 +21,5 @@ HEAT_PRIVATE_SUBNET_CIDR=10.0.5.0/24 # create a heat specific private network (default 'private' network has ipv6 subnet) source $DEST/devstack/openrc demo demo openstack network create heat-net -neutron subnet-create --name heat-subnet heat-net $HEAT_PRIVATE_SUBNET_CIDR - -# Don't use osc command till bug #1625954 is fixed -# openstack router add subnet router1 heat-subnet -neutron router-interface-add router1 heat-subnet +openstack subnet create heat-subnet --network heat-net --subnet-range $HEAT_PRIVATE_SUBNET_CIDR +openstack router add subnet router1 heat-subnet