From aae3c0250fc0f2b67293bafd000fba5a621928fd Mon Sep 17 00:00:00 2001 From: Tim Rozet Date: Wed, 17 Aug 2016 00:36:05 -0400 Subject: Upgrades honeycomb to new version Change-Id: Iee70813504977f6433691d6e9253f329dbe0e372 Signed-off-by: Tim Rozet --- build/overcloud-full.sh | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'build') diff --git a/build/overcloud-full.sh b/build/overcloud-full.sh index 636ac596..b1f59515 100755 --- a/build/overcloud-full.sh +++ b/build/overcloud-full.sh @@ -58,13 +58,13 @@ git archive --format=tar.gz --prefix=congress/ origin/stable/mitaka > ../puppet- popd > /dev/null # create fd.io yum repo file -cat > /tmp/fdio-master.repo << EOF -[fdio-master] -name=fd.io master branch latest merge -baseurl=https://nexus.fd.io/content/repositories/fd.io.master.centos7/ -enabled=1 -gpgcheck=0 -EOF +#cat > /tmp/fdio-master.repo << EOF +#[fdio-master] +#name=fd.io master branch latest merge +#baseurl=https://nexus.fd.io/content/repositories/fd.io.master.centos7/ +#enabled=1 +#gpgcheck=0 +#EOF cat > /tmp/tacker.repo << EOF [tacker-trozet] @@ -127,12 +127,12 @@ LIBGUESTFS_BACKEND=direct virt-customize \ --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 "sed -i \"s/'--detailed-exitcodes',/'--detailed-exitcodes','-l','syslog','-l','console',/g\" /var/lib/heat-config/hooks/puppet" \ - --upload /tmp/fdio-master.repo:/etc/yum.repos.d/fdio-master.repo \ --upload ../vpp-bin.tar.gz:/root \ --run-command "cd /root && tar zxvf vpp-bin.tar.gz" \ --run-command "yum install -y /root/vpp-bin/*.rpm" \ --run-command "tar zxvf /root/vpp-bin/vpp_papi*.tar.gz -C /" \ - --install unzip,honeycomb \ + --install unzip \ + --run-command "yum -y install https://github.com/marosmars/files/raw/master/honeycomb-1.0.0-99.noarch.rpm" \ --upload puppet-fdio.tar.gz:/etc/puppet/modules \ --run-command "cd /etc/puppet/modules && tar xzf puppet-fdio.tar.gz" \ --upload vsperf.tar.gz:/var/opt \ -- cgit 1.2.3-korg