diff options
| author |   Feng Pan <fpan@redhat.com> | 2016-11-30 21:03:33 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2016-11-30 21:03:33 +0000 |
| commit | 199e92bf52cc75046eb41daa917bf91a65708c9f (patch) | |
| tree | 66f941cf3da63d7b5922e910b959228f0f622d00 /build | |
| parent | 71b677dcf162eb6eb22f116ee1b08714efb24db3 (diff) | |
| parent | af3976a683b8bdfd6a16d599940c2aa8dea3a077 (diff) | |
Merge "Updates FD.IO ODL scenarios to use Carbon ODL version"
Diffstat (limited to 'build')
| -rwxr-xr-x | build/overcloud-full.sh | 5 | ||||
| -rwxr-xr-x | build/overcloud-opendaylight.sh | 11 |
2 files changed, 16 insertions, 0 deletions
diff --git a/build/overcloud-full.sh b/build/overcloud-full.sh index 188c40e4..2ad605b9 100755 --- a/build/overcloud-full.sh +++ b/build/overcloud-full.sh @@ -90,6 +90,10 @@ enabled=1 gpgcheck=0 EOF +# Increase disk size by 500MB to accommodate more packages +qemu-img resize overcloud-full_build.qcow2 +500MB + +# expand file system to max disk size # installing forked opnfv-puppet-tripleo # enable connection tracking for protocal sctp # upload dpdk rpms but do not install @@ -102,6 +106,7 @@ EOF # git clone vsperf into the overcloud image # upload the tacker puppet module and untar it LIBGUESTFS_BACKEND=direct virt-customize \ + --run-command "xfs_growfs /dev/sda" \ --upload ../opnfv-puppet-tripleo.tar.gz:/etc/puppet/modules \ --run-command "yum update -y python-ipaddress rabbitmq-server erlang*" \ --run-command "if ! rpm -qa | grep python-redis; then yum install -y python-redis; fi" \ diff --git a/build/overcloud-opendaylight.sh b/build/overcloud-opendaylight.sh index c7ed8c71..4152c195 100755 --- a/build/overcloud-opendaylight.sh +++ b/build/overcloud-opendaylight.sh @@ -43,6 +43,15 @@ enabled=1 gpgcheck=0 EOF +# Master Repo +cat > /tmp/opendaylight_master.repo << EOF +[opendaylight-6-release] +name=CentOS CBS OpenDaylight Carbon repository +baseurl=http://cbs.centos.org/repos/nfv7-opendaylight-6-testing/\$basearch/os/ +enabled=1 +gpgcheck=0 +EOF + # SDNVPN - Copy tunnel setup script wget https://raw.githubusercontent.com/openstack/fuel-plugin-opendaylight/brahmaputra-sr2/deployment_scripts/puppet/modules/opendaylight/templates/setup_TEPs.py @@ -55,6 +64,8 @@ LIBGUESTFS_BACKEND=direct virt-customize \ --upload networking-odl.tar.gz:/root/ \ --upload /tmp/opendaylight_boron.repo:/etc/yum.repos.d/opendaylight.repo \ --run-command "yum install --downloadonly --downloaddir=/root/boron/ opendaylight" \ + --upload /tmp/opendaylight_master.repo:/etc/yum.repos.d/opendaylight.repo \ + --run-command "yum install --downloadonly --downloaddir=/root/master/ opendaylight" \ --upload /tmp/opendaylight.repo:/etc/yum.repos.d/opendaylight.repo \ --install opendaylight,python-networking-odl \ --install https://github.com/michaeltchapman/networking_rpm/raw/master/openstack-neutron-bgpvpn-2015.2-1.el7.centos.noarch.rpm \ |