From e8b6d6debe2b056b404fc353f54b67364b58c59d Mon Sep 17 00:00:00 2001 From: Tim Rozet Date: Mon, 10 Oct 2016 17:11:20 -0400 Subject: Migrate to stable/newton os-odl_l2_nofeature is now deprecated since new netvirt only supports odl_l3. JIRA: APEX-299 Change-Id: I3557ecb85fa4cd11bba96aa9410e56a8e8cceb00 Signed-off-by: Tim Rozet --- build/overcloud-full.sh | 9 --------- 1 file changed, 9 deletions(-) (limited to 'build/overcloud-full.sh') diff --git a/build/overcloud-full.sh b/build/overcloud-full.sh index b148542f..e35a89f1 100755 --- a/build/overcloud-full.sh +++ b/build/overcloud-full.sh @@ -18,11 +18,6 @@ if [ ! -d images/ ]; then mkdir images; fi tar -xf cache/overcloud-full.tar -C images/ mv -f images/overcloud-full.qcow2 images/overcloud-full_build.qcow2 -# Add extra space to the overcloud image -qemu-img resize images/overcloud-full_build.qcow2 +1G -LIBGUESTFS_BACKEND=direct virt-customize -a images/overcloud-full_build.qcow2 \ - --run-command 'resize2fs /dev/sda' - ########################################################## ##### Prep initial overcloud image with common deps ##### ########################################################## @@ -139,10 +134,6 @@ LIBGUESTFS_BACKEND=direct virt-customize \ --run-command "cd /etc/puppet/modules && tar xzf puppet-fdio.tar.gz" \ --upload vsperf.tar.gz:/var/opt \ --run-command "cd /var/opt && tar xzf vsperf.tar.gz" \ - --upload ../noarch/python-tackerclient-2015.2-1.trozet.noarch.rpm:/root/ \ - --install /root/python-tackerclient-2015.2-1.trozet.noarch.rpm \ - --upload ../noarch/openstack-tacker-2015.2-1.trozet.noarch.rpm:/root/ \ - --install /root/openstack-tacker-2015.2-1.trozet.noarch.rpm \ --upload puppet-tacker.tar.gz:/etc/puppet/modules/ \ --run-command "cd /etc/puppet/modules/ && tar xzf puppet-tacker.tar.gz" \ --run-command "pip install python-senlinclient" \ -- cgit 1.2.3-korg