From: Feng Pan <fpan@redhat.com>
Date: Mon, 2 Oct 2017 18:23:56 +0000 (+0000)
Subject: Merge "Fixes python-networking-sfc install"
X-Git-Tag: opnfv-6.0.0~81
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=864527cb7a61eda541aa812fe985843989595e9a;hp=11be8e73043eeaa9ec18508410ec28faecbccc08;p=apex.git

Merge "Fixes python-networking-sfc install"
---

diff --git a/build/overcloud-full.sh b/build/overcloud-full.sh
index 789cdedb..06adbbe6 100755
--- a/build/overcloud-full.sh
+++ b/build/overcloud-full.sh
@@ -159,7 +159,7 @@ LIBGUESTFS_BACKEND=direct virt-customize \
     --run-command "mkdir /root/ovs28" \
     --run-command "yumdownloader --destdir=/root/ovs28 openvswitch*2.8* python-openvswitch-2.8*" \
     --upload ${CACHE_DIR}/$kvmfornfv_kernel_rpm:/root/ \
-    --install python2-networking-sfc \
+    --install "http://mirror.centos.org/centos/7/cloud/x86_64/openstack-ocata/python2-networking-sfc-4.0.0-1.el7.noarch.rpm" \
     --install python-etcd,puppet-etcd \
     --install patch \
     --install docker,kubelet,kubeadm,kubectl,kubernetes-cni \
diff --git a/build/undercloud.sh b/build/undercloud.sh
index 78124223..baaf424e 100755
--- a/build/undercloud.sh
+++ b/build/undercloud.sh
@@ -40,7 +40,7 @@ LIBGUESTFS_BACKEND=direct virt-customize \
     --upload ${BUILD_DIR}/apex-tripleo-heat-templates.tar.gz:/usr/share \
     --install "openstack-utils" \
     --install "ceph-common" \
-    --install "python2-networking-sfc" \
+    --install "http://mirror.centos.org/centos/7/cloud/x86_64/openstack-ocata/python2-networking-sfc-4.0.0-1.el7.noarch.rpm" \
     --install epel-release \
     --install python34,python34-pip \
     --install openstack-ironic-inspector,subunit-filters,docker-distribution,openstack-tripleo-validations \