From: Tim Rozet <trozet@redhat.com>
Date: Wed, 17 Aug 2016 17:05:28 +0000 (+0000)
Subject: Merge "adding tackerclient to the build"
X-Git-Tag: colorado.1.0~70
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=295f767df246efb71eb1bb394ae0f85654710699;p=apex.git

Merge "adding tackerclient to the build"
---

295f767df246efb71eb1bb394ae0f85654710699
diff --cc build/overcloud-full.sh
index b1f59515,98a0477b..5814c5ca
--- a/build/overcloud-full.sh
+++ b/build/overcloud-full.sh
@@@ -58,22 -58,14 +58,14 @@@ git archive --format=tar.gz --prefix=co
  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]
- name=Tacker RPMs built from https://github.com/trozet/ tacker repositories
- baseurl=http://radez.fedorapeople.org/tacker/
- enabled=1
- gpgcheck=0
- EOF
- 
  # tar up the fd.io module
  rm -rf puppet-fdio
  git clone https://github.com/radez/puppet-fdio