diff options
Diffstat (limited to 'build/overcloud-full.sh')
| -rwxr-xr-x | build/overcloud-full.sh | 38 |
1 files changed, 16 insertions, 22 deletions
diff --git a/build/overcloud-full.sh b/build/overcloud-full.sh index a7d04eeb..e7f1dd7d 100755 --- a/build/overcloud-full.sh +++ b/build/overcloud-full.sh @@ -58,21 +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/tacker.repo << EOF -[tacker-trozet] -name=Tacker RPMs built from https://github.com/trozet/ tacker repositories -baseurl=http://radez.fedorapeople.org/tacker/ -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 # tar up the fd.io module rm -rf puppet-fdio @@ -104,7 +96,6 @@ popd > /dev/null # install fd.io yum repo and packages # upload puppet fdio # git clone vsperf into the overcloud image -# upload tacker repo and install the packages # upload the tacker puppet module and untar it LIBGUESTFS_BACKEND=direct virt-customize \ --upload ../opnfv-puppet-tripleo.tar.gz:/etc/puppet/modules \ @@ -127,16 +118,19 @@ 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 \ - --install unzip,vpp,honeycomb \ + --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 \ --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 \ --run-command "cd /var/opt && tar xzf vsperf.tar.gz" \ - --upload /tmp/tacker.repo:/etc/yum.repos.d/ \ - --install "python-tackerclient" \ - --upload ../noarch/openstack-tacker-2015.2-1.noarch.rpm:/root/ \ - --install /root/openstack-tacker-2015.2-1.noarch.rpm \ + --upload ../noarch/python-tackerclient-2015.2-1.trozet.noarch.rpm:/root/ \ + --install /root/python-tackerclient-2015.2-1.trozet.noarch.rpm \ + --upload ../noarch/openstack-tacker-2015.2-1.trozet.noarch.rpm:/root/ \ + --install /root/openstack-tacker-2015.2-1.trozet.noarch.rpm \ --upload puppet-tacker.tar.gz:/etc/puppet/modules/ \ --run-command "cd /etc/puppet/modules/ && tar xzf puppet-tacker.tar.gz" \ --run-command "yum install -y https://dl.dropboxusercontent.com/u/7079970/rabbitmq-server-3.6.3-5.el7ost.noarch.rpm" \ |