diff options
| author |   Dan Radez <dradez@redhat.com> | 2017-04-03 12:57:11 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-04-03 12:57:11 +0000 |
| commit | d970df54b78c5648a62711f9dbc42ec658baf05d (patch) | |
| tree | 69bb72d33a9cd4b2b37c6d5c3ec6daf97b95e9bc | |
| parent | 035c80d52a780125ba84d1bc5f8232c9ff2a4a17 (diff) | |
| parent | 77706c0584454cac0dde32947f0ddeb84ee64b0e (diff) | |
Merge "Remove ocata puppet-ovn injection"
| -rwxr-xr-x | build/overcloud-full.sh | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/build/overcloud-full.sh b/build/overcloud-full.sh index 9de6d9ab..963579f3 100755 --- a/build/overcloud-full.sh +++ b/build/overcloud-full.sh @@ -68,13 +68,6 @@ pushd puppet-tacker > /dev/null git archive --format=tar.gz --prefix=tacker/ origin/stable/ocata > ${BUILD_DIR}/puppet-tacker.tar.gz popd > /dev/null -# tar up the ovn puppet module -rm -rf puppet-ovn -git clone https://github.com/openstack/puppet-ovn -pushd puppet-ovn > /dev/null -git archive --format=tar.gz --prefix=ovn/ origin/stable/ocata > ${BUILD_DIR}/puppet-ovn.tar.gz -popd > /dev/null - # Master FD.IO Repo cat > ${BUILD_DIR}/fdio.repo << EOF [fdio-master] @@ -158,8 +151,6 @@ LIBGUESTFS_BACKEND=direct virt-customize \ --install /root/$tacker_pkg \ --upload ${BUILD_DIR}/noarch/$tackerclient_pkg:/root/ \ --install /root/$tackerclient_pkg \ - --upload ${BUILD_DIR}/puppet-ovn.tar.gz:/etc/puppet/modules/ \ - --run-command "cd /etc/puppet/modules/ && rm -fr ovn && tar xzf puppet-ovn.tar.gz" \ --run-command "curl -f https://copr.fedorainfracloud.org/coprs/leifmadsen/ovs-master/repo/epel-7/leifmadsen-ovs-master-epel-7.repo > /etc/yum.repos.d/leifmadsen-ovs-master-epel-7.repo" \ --run-command "mkdir /root/ovs27" \ --run-command "yumdownloader --destdir=/root/ovs27 openvswitch*2.7* python-openvswitch-2.7*" \ |