Merge "Updates FD.IO ODL scenarios to use Carbon ODL version"

diff --combined build/overcloud-full.sh
index 188c40e,e4f966c..2ad605b
--- 1/build/overcloud-full.sh
--- 2/build/overcloud-full.sh
+++ b/build/overcloud-full.sh
@@@ -90,6 -90,10 +90,10 @@@ enabled=
  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 +106,7 @@@
  # 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" \
@@@ -113,8 -118,7 +118,8 @@@
      --upload /tmp/fdio.repo:/etc/yum.repos.d/fdio.repo \
      $dpdk_pkg_str \
      --run-command "yum install --downloadonly --downloaddir=/root/fdio vpp vpp-devel vpp-lib vpp-python-api vpp-plugins" \
 -    --upload ../networking-vpp.noarch.rpm:/root/fdio \
 +    $fdio_pkg_str \
 +    --upload ../noarch/$netvpp_pkg:/root/fdio \
      --run-command "pip install distro flask_restful" \
      --run-command "yum install -y etcd" \
      --run-command "pip install python-etcd" \
@@@ -125,8 -129,8 +130,8 @@@
      --run-command "yum remove -y qemu-system-x86" \
      --upload ../os-net-config.tar.gz:/usr/lib/python2.7/site-packages \
      --run-command "cd /usr/lib/python2.7/site-packages/ && rm -rf os_net_config && tar xzf os-net-config.tar.gz" \
 -    --upload ../noarch/$openstack_congress_pkg:/root/ \
 -    --install /root/$openstack_congress_pkg \
 +    --upload ../noarch/$congress_pkg:/root/ \
 +    --install /root/$congress_pkg \
      --install "python2-congressclient" \
      --upload puppet-congress.tar.gz:/etc/puppet/modules/ \
      --run-command "cd /etc/puppet/modules/ && tar xzf puppet-congress.tar.gz" \