diff options
| author |   Dan Radez <dradez@redhat.com> | 2016-11-28 15:14:11 -0500 |
|---|---|---|
| committer | Dan Radez <dradez@redhat.com> | 2016-12-22 08:58:53 -0500 |
| commit | 93aba2bc54c77f14ff77c78be4da0f7d5131162e (patch) | |
| tree | edf0b760d98bb9847c0d82af06552cea708760a3 /build/overcloud-full.sh | |
| parent | 66ca37b6205d256454f2f1973de32ed7fa062902 (diff) | |
Updating Congress version to Newton
- Congress is not in THT now so this will not install yet
- Removing doctor driver sideload in build
The doctor driver is upstream in Newton. No need to side load the
driver into the congress codebase anymore.
- moving to upstream puppet module
Change-Id: Ia60d7d33039dddda634cb5485a3c40ce6ec2b261
Signed-off-by: Dan Radez <dradez@redhat.com>
Diffstat (limited to 'build/overcloud-full.sh')
| -rwxr-xr-x | build/overcloud-full.sh | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/build/overcloud-full.sh b/build/overcloud-full.sh index e97ae70a..3d9d582e 100755 --- a/build/overcloud-full.sh +++ b/build/overcloud-full.sh @@ -45,9 +45,9 @@ done # tar up the congress puppet module rm -rf puppet-congress -git clone -b stable/mitaka https://github.com/radez/puppet-congress +git clone https://github.com/openstack/puppet-congress pushd puppet-congress > /dev/null -git archive --format=tar.gz --prefix=congress/ origin/stable/mitaka > ${BUILD_DIR}/puppet-congress.tar.gz +git archive --format=tar.gz --prefix=congress/ HEAD > ${BUILD_DIR}/puppet-congress.tar.gz popd > /dev/null # tar up the fd.io module @@ -88,7 +88,6 @@ qemu-img resize overcloud-full_build.qcow2 +500MB # enable connection tracking for protocal sctp # install the congress rpms # upload and explode the congress puppet module -# install doctor driver ## Can be removed in Newton # install fd.io yum repo and packages # upload puppet fdio # git clone vsperf into the overcloud image @@ -122,7 +121,6 @@ LIBGUESTFS_BACKEND=direct virt-customize \ --install "python2-congressclient" \ --upload ${BUILD_DIR}/puppet-congress.tar.gz:/etc/puppet/modules/ \ --run-command "cd /etc/puppet/modules/ && tar xzf puppet-congress.tar.gz" \ - --run-command "cd /usr/lib/python2.7/site-packages/congress/datasources && curl -O $doctor_driver" \ --run-command "yum install -y /root/fdio/*.rpm" \ --run-command "rm -f /etc/sysctl.d/80-vpp.conf" \ --install unzip \ |