diff options
| -rwxr-xr-x | build/overcloud-full.sh | 5 | ||||
| -rwxr-xr-x | build/overcloud-opendaylight.sh | 11 | ||||
| -rwxr-xr-x | ci/deploy.sh | 7 | ||||
| -rwxr-xr-x | ci/dev_dep_check.sh | 15 | ||||
| -rw-r--r-- | config/deploy/os-odl_l2-fdio-ha.yaml | 2 | ||||
| -rw-r--r-- | config/deploy/os-odl_l2-fdio-noha.yaml | 2 | ||||
| -rw-r--r-- | lib/common-functions.sh | 2 | ||||
| -rwxr-xr-x | lib/overcloud-deploy-functions.sh | 14 |
8 files changed, 50 insertions, 8 deletions
diff --git a/build/overcloud-full.sh b/build/overcloud-full.sh index f4633d6f..a50200bb 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 \ diff --git a/ci/deploy.sh b/ci/deploy.sh index 482e134b..f09529a7 100755 --- a/ci/deploy.sh +++ b/ci/deploy.sh @@ -24,6 +24,7 @@ green=$(tput setaf 2 || echo "") interactive="FALSE" ping_site="8.8.8.8" +dnslookup_site="www.google.com" post_config="TRUE" debug="FALSE" @@ -82,6 +83,7 @@ display_usage() { echo -e " --inventory | -i : Full path to inventory yaml file. Required only for baremetal" echo -e " --net-settings | -n : Full path to network settings file. Optional." echo -e " --ping-site | -p : site to use to verify IP connectivity. Optional. Defaults to 8.8.8.8" + echo -e " --dnslookup-site : site to use to verify DNS resolution. Optional. Defaults to www.google.com" echo -e " --virtual | -v : Virtualize overcloud nodes instead of using baremetal." echo -e " --no-post-config : disable Post Install configuration." echo -e " --debug : enable debug output." @@ -123,6 +125,11 @@ parse_cmdline() { echo "Using $2 as the ping site" shift 2 ;; + --dnslookup-site) + dnslookup_site=$2 + echo "Using $2 as the dnslookup site" + shift 2 + ;; -v|--virtual) virtual="TRUE" echo "Executing a Virtual Deployment" diff --git a/ci/dev_dep_check.sh b/ci/dev_dep_check.sh index 52643459..6814227e 100755 --- a/ci/dev_dep_check.sh +++ b/ci/dev_dep_check.sh @@ -64,11 +64,20 @@ virt_pkgs=( 'perl-Sys-Guestfs-1.32.7-3.el7.x86_64.rpm' 'python-libguestfs-1.32.7-3.el7.x86_64.rpm' ) - +dir=/tmp/packages.$RANDOM +mkdir -p $dir +pushd $dir +all_packages="" for pkg in ${virt_pkgs[@]}; do if ! rpm -q ${pkg%-*-*}; then - if ! sudo yum -y install $virt_uri_base/$pkg; then - echo "ERROR: Failed to update $pkg" + if ! wget $virt_uri_base/$pkg; then + echo "ERROR: Failed to download $pkg" fi + all_packages="$all_packages $pkg" fi done +if [[ $all_packages != "" ]];then + yum install -y $all_packages +fi +rm -rf $dir +popd diff --git a/config/deploy/os-odl_l2-fdio-ha.yaml b/config/deploy/os-odl_l2-fdio-ha.yaml index 82836573..d4a86b0f 100644 --- a/config/deploy/os-odl_l2-fdio-ha.yaml +++ b/config/deploy/os-odl_l2-fdio-ha.yaml @@ -4,7 +4,7 @@ global_params: deploy_options: sdn_controller: opendaylight sdn_l3: false - odl_version: boron + odl_version: carbon tacker: true congress: true sfc: false diff --git a/config/deploy/os-odl_l2-fdio-noha.yaml b/config/deploy/os-odl_l2-fdio-noha.yaml index 53d6181a..b9e0cea6 100644 --- a/config/deploy/os-odl_l2-fdio-noha.yaml +++ b/config/deploy/os-odl_l2-fdio-noha.yaml @@ -4,7 +4,7 @@ global_params: deploy_options: sdn_controller: opendaylight sdn_l3: false - odl_version: boron + odl_version: carbon tacker: true congress: true sfc: false diff --git a/lib/common-functions.sh b/lib/common-functions.sh index 2d113450..709dbf97 100644 --- a/lib/common-functions.sh +++ b/lib/common-functions.sh @@ -281,7 +281,7 @@ contains_prefix() { #params: none function verify_internet { if ping -c 2 $ping_site > /dev/null; then - if ping -c 2 www.google.com > /dev/null; then + if ping -c 2 $dnslookup_site > /dev/null; then echo "${blue}Internet connectivity detected${reset}" return 0 else diff --git a/lib/overcloud-deploy-functions.sh b/lib/overcloud-deploy-functions.sh index 4b592b46..c8367c9f 100755 --- a/lib/overcloud-deploy-functions.sh +++ b/lib/overcloud-deploy-functions.sh @@ -128,10 +128,20 @@ EOI fi # Set ODL version accordingly - if [[ "${deploy_options_array['sdn_controller']}" == 'opendaylight' && "${deploy_options_array['odl_version']}" == 'boron' ]]; then + if [[ "${deploy_options_array['sdn_controller']}" == 'opendaylight' && -n "${deploy_options_array['odl_version']}" ]]; then + case "${deploy_options_array['odl_version']}" in + boron) odl_version='boron' + ;; + cabron) odl_version='master' + ;; + *) echo -e "${red}Invalid ODL version ${deploy_options_array['odl_version']}. Please use 'carbon' or 'boron' values.${reset}" + exit 1 + ;; + esac + ssh -T ${SSH_OPTIONS[@]} "stack@$UNDERCLOUD" <<EOI LIBGUESTFS_BACKEND=direct virt-customize --run-command "yum -y remove opendaylight" \ - --run-command "yum -y install /root/boron/*" \ + --run-command "yum -y install /root/${odl_version}/*" \ -a overcloud-full.qcow2 EOI fi |