diff options
| author |   Tim Rozet <trozet@redhat.com> | 2016-06-10 15:26:15 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@172.30.200.206> | 2016-06-10 15:26:15 +0000 |
| commit | d1043f15f044dc0ee0ab4c76038e74c5f3b7fe75 (patch) | |
| tree | 5a12cb92a9b138f4fd2d7a25ee69a2ec5bfd08b7 | |
| parent | 5d889e95dbcab85e6d073b7b6d29e3ea5b47f87d (diff) | |
| parent | 1fd700e613e2863038479081e8dca5b268fab241 (diff) | |
Merge "updating undercloud build"
| -rwxr-xr-x | build/undercloud.sh | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/build/undercloud.sh b/build/undercloud.sh index f2e98795..551dbd88 100755 --- a/build/undercloud.sh +++ b/build/undercloud.sh @@ -13,7 +13,7 @@ source ./variables.sh populate_cache "$rdo_images_uri/undercloud.qcow2" if [ ! -d images ]; then mkdir images/; fi -cp -f cache/undercloud.qcow2 images/ +cp -f cache/undercloud.qcow2 images/undercloud_build.qcow2 #Adding OpenStack packages to undercloud pushd images > /dev/null @@ -56,7 +56,7 @@ git archive --format=tar.gz --prefix=openstack-tripleo-heat-templates/ HEAD > .. popd > /dev/null LIBGUESTFS_BACKEND=direct virt-customize --upload opnfv-tht.tar.gz:/usr/share \ --run-command "cd /usr/share && rm -rf openstack-tripleo-heat-templates && tar xzf opnfv-tht.tar.gz" \ - -a undercloud.qcow2 + -a undercloud_build.qcow2 # install the packages above and enabling ceph to live on the controller # OpenWSMan package update supports the AMT Ironic driver for the TealBox @@ -68,7 +68,7 @@ LIBGUESTFS_BACKEND=direct virt-customize \ --run-command "cp /usr/share/instack-undercloud/undercloud.conf.sample /home/stack/undercloud.conf && chown stack:stack /home/stack/undercloud.conf" \ --upload ../opnfv-environment.yaml:/home/stack/ \ --upload ../virtual-environment.yaml:/home/stack/ \ - -a undercloud.qcow2 + -a undercloud_build.qcow2 # Add custom IPA to allow kernel params wget https://raw.githubusercontent.com/trozet/ironic-python-agent/opnfv_kernel/ironic_python_agent/extensions/image.py @@ -79,6 +79,7 @@ LIBGUESTFS_BACKEND=direct virt-customize --upload ../build_perf_image.sh:/home/s --upload ../set_perf_images.sh:/home/stack \ --upload image.py:/root \ --upload image.pyc:/root \ - -a undercloud.qcow2 + -a undercloud_build.qcow2 +mv -f undercloud_build.qcow2 undercloud.qcow2 popd > /dev/null |