summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Radez <dradez@redhat.com>2017-03-10 15:07:12 -0500
committerDan Radez <dradez@redhat.com>2017-03-31 09:59:27 -0400
commit77706c0584454cac0dde32947f0ddeb84ee64b0e (patch)
treed062641d8cd6bb32a056c37fa5c7eb840e0b4b0d
parent1d655538cfe9a665c5e12dc8b910ddaaae21bae7 (diff)
Remove ocata puppet-ovn injection
This was needed in Danube, can be removed for Euphrates+ JIRA: APEX-431 Change-Id: Ic2101581c3ae9cbf80d5ed6b64be8e7b3bc9abf7 Signed-off-by: Dan Radez <dradez@redhat.com>
-rwxr-xr-xbuild/overcloud-full.sh9
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*" \