diff options
author | 2018-05-02 12:34:38 -0400 | |
---|---|---|
committer | 2018-05-21 10:36:05 -0400 | |
commit | d2913d4bcc0fcd25dc3d01f6604049dfd0a9217d (patch) | |
tree | 5cf7a0d04cbf8b30488bb18ba7ee79e215f08e47 /build/overcloud-onos.sh | |
parent | 22bc385f5b2e25694699a614268aaad2fdacbb12 (diff) |
Migrates master to use direct upstream
We now move master to deploy from upstream. That means we do not need
to build undercloud/overcloud images anymore.
Changes-Include:
- Remove bash build scripts as we do not need to build anything
other than the python package anymore
- Remove building images or iso from build.py
- Remove building of images and iso from Makefile
- Rename/refactor deploy settings files for nosdn and odl. The new
convention is that the typical scenario names we use will deploy
master. We also support n-1 OS, so in that case we use the branch
name for the "feature" in the scenario name: os-odl-queens-noha.
- Tacker/Congress are disabled in settings files until we fix that with
upstream. Containers are now enabled by default.
- Disable TLS for undercloud (was changed upstream to default enabled)
- Fix environments docker directory for master THT (was changed upstream)
- Includes fix for LP#1768901
- Includes workaround for LP#1770692
- Moves to docker.io for container images as it is more stable and
should contain the same images
- Removes the term 'common' from apex packaging for referencing the
Python Apex package
Change-Id: If6b433860b3ff882686c78d0f24a2f0c52b9b57a
Signed-off-by: Tim Rozet <trozet@redhat.com>
Diffstat (limited to 'build/overcloud-onos.sh')
-rwxr-xr-x | build/overcloud-onos.sh | 46 |
1 files changed, 0 insertions, 46 deletions
diff --git a/build/overcloud-onos.sh b/build/overcloud-onos.sh deleted file mode 100755 index 6af4118b..00000000 --- a/build/overcloud-onos.sh +++ /dev/null @@ -1,46 +0,0 @@ -#!/bin/sh -############################################################################## -# Copyright (c) 2015 Tim Rozet (Red Hat), Dan Radez (Red Hat) and others. -# -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Apache License, Version 2.0 -# which accompanies this distribution, and is available at -# http://www.apache.org/licenses/LICENSE-2.0 -############################################################################## -set -e -source ./cache.sh -source ./variables.sh - -pushd ${BUILD_DIR} > /dev/null -cp -f overcloud-full.qcow2 overcloud-full-onos_build.qcow2 - -####################################### -##### Adding ONOS to overcloud ##### -####################################### - -# get the onos files -rm -rf puppet-onos -populate_cache "$onos_release_uri/$onos_release_file" "$(curl https://downloads.onosproject.org/nightly/ | grep $onos_release_file | grep -o -e '[0-9a-f]\{32\}')" -populate_cache "$onos_jdk_uri/jdk-8u51-linux-x64.tar.gz" - -LIBGUESTFS_BACKEND=direct $VIRT_CUSTOMIZE --upload ${CACHE_DIR}/${onos_release_file}:/opt/ \ - --run-command "mkdir /opt/onos && cd /opt/ && tar -xzf $onos_release_file -C /opt/onos --strip-components=1" \ - -a overcloud-full-onos_build.qcow2 - -#Those files can be store in local cache for saving download time -git clone https://github.com/bobzhouHW/puppet-onos.git -tar --xform="s:puppet-onos/:onos/:" -czf puppet-onos.tar.gz puppet-onos - -LIBGUESTFS_BACKEND=direct $VIRT_CUSTOMIZE --upload ${CACHE_DIR}/jdk-8u51-linux-x64.tar.gz:/opt/ \ - --upload ${BUILD_DIR}/puppet-onos/files/install_jdk8.tar:/opt/ \ - --run-command "cd /opt/ && tar -xf install_jdk8.tar && sh /opt/install_jdk8/install_jdk8.sh" \ - --upload ${BUILD_DIR}/puppet-onos/files/networking-onos.tar:/opt/ \ - --run-command "cd /opt/ && tar -xf networking-onos.tar && sh /opt/networking-onos/install_driver.sh" \ - --upload ${BUILD_DIR}/puppet-onos/files/networking-sfc.tar:/opt/ \ - --run-command "cd /opt/ && tar -xf networking-sfc.tar && sh /opt/networking-sfc/install_driver.sh" \ - --upload ${BUILD_DIR}/puppet-onos.tar.gz:/etc/puppet/modules/ \ - --run-command "cd /etc/puppet/modules/ && tar xzf puppet-onos.tar.gz" \ - -a overcloud-full-onos_build.qcow2 - -mv overcloud-full-onos_build.qcow2 overcloud-full-onos.qcow2 -popd > /dev/null |