diff options
| author |   Feng Pan <fpan@redhat.com> | 2017-07-19 12:59:20 -0400 |
|---|---|---|
| committer | Feng Pan <fpan@redhat.com> | 2017-07-29 07:31:06 -0400 |
| commit | 29d4c7d5849d8690a3567e502b71336116f4e11b (patch) | |
| tree | 00fef687ca2885f92528983271bacf98e0c728b7 /build/overcloud-opendaylight.sh | |
| parent | 64e055560e1f3ed47805d921541d884ea79624cf (diff) | |
Add support for fdio scenarios
Add support for the following scenarios:
- os-odl-fdio-ha
- os-odl-fdio-noha
- os-nosdn-fdio-noha
- os-nosdn-fdio-ha
apex-tripleo-heat-templates: If11092e6581445a70e63c8f6c48518698b3cc8fc
apex-puppet-tripleo: If498c41d706c8f14a5b0bbee64cb4d26cd78c2d0
apex-os-net-config: If7a2c6119bf613f1fc8846237b077cd8f0e26015
Change-Id: Id3fdd09f6e0d2b7666d08c0dc7802165797eefdc
Signed-off-by: Feng Pan <fpan@redhat.com>
Diffstat (limited to 'build/overcloud-opendaylight.sh')
| -rwxr-xr-x | build/overcloud-opendaylight.sh | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/build/overcloud-opendaylight.sh b/build/overcloud-opendaylight.sh index 12b47f1e..3b4e02ae 100755 --- a/build/overcloud-opendaylight.sh +++ b/build/overcloud-opendaylight.sh @@ -49,6 +49,9 @@ popd > /dev/null # Download ODL netvirt for VPP populate_cache http://artifacts.opnfv.org/apex/danube/fdio_netvirt/opendaylight-7.0.0-0.1.20170531snap665.el7.noarch.rpm +# Download ODL for fdio scenarios +populate_cache http://artifacts.opnfv.org/apex/danube/fdio_odls/fdio_odl_carbon.tar.gz + # install ODL packages # Patch in OPNFV custom puppet-tripleO # install Honeycomb @@ -70,6 +73,7 @@ LIBGUESTFS_BACKEND=direct virt-customize \ --install capnproto-libs,capnproto \ --upload ${BUILD_ROOT}/patches/neutron-patch-NSDriver.patch:/usr/lib/python2.7/site-packages/ \ --upload ${CACHE_DIR}/opendaylight-7.0.0-0.1.20170531snap665.el7.noarch.rpm:/root/ \ + --upload ${CACHE_DIR}/fdio_odl_carbon.tar.gz:/root/ \ -a overcloud-full-opendaylight_build.qcow2 # Arch dependent on x86 @@ -78,11 +82,11 @@ if [ "$(uname -i)" == 'x86_64' ]; then # Download quagga/zrpc rpms populate_cache http://artifacts.opnfv.org/apex/danube/quagga/quagga-3.tar.gz # Download Honeycomb -populate_cache https://nexus.fd.io/content/repositories/fd.io.stable.1704.centos7/io/fd/hc2vpp/honeycomb/1.17.04-2048.noarch/honeycomb-1.17.04-2048.noarch.rpm +populate_cache $honeycomb_pkg LIBGUESTFS_BACKEND=direct virt-customize \ - --upload ${CACHE_DIR}/honeycomb-1.17.04-2048.noarch.rpm:/root/fdio/ \ - --run-command "yum install -y /root/fdio/honeycomb-1.17.04-2048.noarch.rpm" \ + --upload ${CACHE_DIR}/${honeycomb_pkg##*/}:/root/fdio/ \ + --run-command "yum install -y /root/fdio/${honeycomb_pkg##*/}" \ --install zeromq-4.1.4 \ --upload ${CACHE_DIR}/quagga-3.tar.gz:/root/ \ --run-command "cd /root/ && tar xzf quagga-3.tar.gz" \ |