Update networking-vpp packaging

- Change package to python-networking-vpp
- Turn off autoreq for /bin/python
- Update vpp to 17.01
- Disables undercloud package updating

Change-Id: I9743e73ca9c36cc5162076580dc0a6b8861c7149
Signed-off-by: Feng Pan <fpan@redhat.com>

diff --git a/build/Makefile b/build/Makefile
index cd00e5f..30af162 100644 (file)
--- a/build/Makefile
+++ b/build/Makefile
@@ -180,15 +180,15 @@ $(BUILD_DIR)/noarch/openstack-congress-2016.1-1.git$(CONGRESS_COMMIT).noarch.rpm
 # NETWORKING-VPP #
 ##################
 
-$(BUILD_DIR)/networking-vpp.tar.gz:
+$(BUILD_DIR)/python-networking-vpp.tar.gz:
        @echo "Preparing the networking-vpp RPM prerequisites"
-       git clone $(NETVPP_REPO) $(BUILD_DIR)/networking-vpp-$(NETVPP_VERS)
-       tar czf $(BUILD_DIR)/networking-vpp.tar.gz -C $(BUILD_DIR) networking-vpp-$(NETVPP_VERS)
+       git clone $(NETVPP_REPO) $(BUILD_DIR)/python-networking-vpp-$(NETVPP_VERS)
+       tar czf $(BUILD_DIR)/python-networking-vpp.tar.gz -C $(BUILD_DIR) python-networking-vpp-$(NETVPP_VERS)
 
 .PHONY: networking-vpp-rpm
-networking-vpp-rpm: $(BUILD_DIR)/noarch/networking-vpp-$(NETVPP_VERS)-1.git$(NETVPP_COMMIT)$(RPM_DIST).noarch.rpm
+networking-vpp-rpm: $(BUILD_DIR)/noarch/python-networking-vpp-$(NETVPP_VERS)-1.git$(NETVPP_COMMIT)$(RPM_DIST).noarch.rpm
 
-$(BUILD_DIR)/noarch/networking-vpp-$(NETVPP_VERS)-1.git$(NETVPP_COMMIT)$(RPM_DIST).noarch.rpm: $(BUILD_DIR)/networking-vpp.tar.gz
+$(BUILD_DIR)/noarch/python-networking-vpp-$(NETVPP_VERS)-1.git$(NETVPP_COMMIT)$(RPM_DIST).noarch.rpm: $(BUILD_DIR)/python-networking-vpp.tar.gz
        @echo "Building the Networking VPP RPM"
        rpmbuild --clean -ba --target noarch rpm_specs/networking-vpp.spec $(RPM_DIR_ARGS) -D 'git .git$(NETVPP_COMMIT)'
 

diff --git a/build/overcloud-full.sh b/build/overcloud-full.sh
index ce2fcdf..75330f3 100755 (executable)
--- a/build/overcloud-full.sh
+++ b/build/overcloud-full.sh
@@ -52,7 +52,7 @@ popd > /dev/null
 
 # tar up the fd.io module
 rm -rf puppet-fdio
-git clone https://github.com/radez/puppet-fdio
+git clone https://git.fd.io/puppet-fdio
 pushd puppet-fdio > /dev/null
 git archive --format=tar.gz --prefix=fdio/ HEAD > ${BUILD_DIR}/puppet-fdio.tar.gz
 popd > /dev/null
@@ -106,9 +106,8 @@ LIBGUESTFS_BACKEND=direct virt-customize \
     --run-command "mkdir /root/dpdk_rpms" \
     --upload ${BUILD_DIR}/fdio.repo:/etc/yum.repos.d/fdio.repo \
     $dpdk_pkg_str \
-    --run-command "yum install --downloadonly --downloaddir=/root/fdio vpp-16.12 vpp-devel-16.12 vpp-lib-16.12 vpp-python-api-16.12 vpp-plugins-16.12" \
+    --run-command "yum install --downloadonly --downloaddir=/root/fdio vpp vpp-devel vpp-lib vpp-python-api vpp-plugins" \
     --upload ${BUILD_DIR}/noarch/$netvpp_pkg:/root/fdio \
-    --run-command "pip install distro flask_restful" \
     --run-command "yum install -y etcd" \
     --run-command "pip install python-etcd" \
     --run-command "puppet module install cristifalcas/etcd" \

diff --git a/build/rpm_specs/networking-vpp.spec b/build/rpm_specs/networking-vpp.spec
index fea66eb..97668c8 100644 (file)
--- a/build/rpm_specs/networking-vpp.spec
+++ b/build/rpm_specs/networking-vpp.spec
@@ -1,16 +1,17 @@
 %define release 1
 
 Summary:   OpenStack Networking for VPP
-Name:      networking-vpp
+Name:      python-networking-vpp
 Version:   0.0.1
 Release:   %{release}%{?git}%{?dist}
 
 License:   Apache 2.0
 Group:     Applications/Internet
-Source0:   networking-vpp.tar.gz
+Source0:   python-networking-vpp.tar.gz
 Url:       https://github.com/openstack/networking-vpp/
 
 BuildArch: noarch
+AutoReq:   no
 Requires:  vpp
 Vendor:    OpenStack <openstack-dev@lists.openstack.org>
 Packager:  Feng Pan <fpan@redhat.com>
@@ -20,7 +21,7 @@ ML2 Mechanism driver and small control plane for OpenVPP forwarder
 
 %prep
 %setup -q
-cat << EOF > %{_builddir}/networking-vpp-agent.service
+cat << EOF > %{_builddir}/neutron-vpp-agent.service
 [Unit]
 Description=Networking VPP ML2 Agent
 
@@ -39,11 +40,11 @@ EOF
 %install
 python setup.py install -O1 --root=%{buildroot} --record=INSTALLED_FILES
 mkdir -p %{buildroot}/usr/lib/systemd/system
-install %{_builddir}/networking-vpp-agent.service %{buildroot}/usr/lib/systemd/system
+install %{_builddir}/neutron-vpp-agent.service %{buildroot}/usr/lib/systemd/system
 
 %clean
 rm -rf %{buildroot}
 
 %files -f INSTALLED_FILES
 %defattr(-,root,root)
-%attr(644,root,root) /usr/lib/systemd/system/networking-vpp-agent.service
+%attr(644,root,root) /usr/lib/systemd/system/neutron-vpp-agent.service

diff --git a/build/undercloud.sh b/build/undercloud.sh
index 5352ac7..b830f31 100755 (executable)
--- a/build/undercloud.sh
+++ b/build/undercloud.sh
@@ -37,6 +37,7 @@ python3 -c 'import py_compile; py_compile.compile("image.py", cfile="image.pyc")
 # add tacker password to python-tripleoclient
 # upload tacker repo and install the client package
 # Add performance image scripts
+# hack for disabling undercloud package update
 LIBGUESTFS_BACKEND=direct virt-customize \
     --run-command "sed -i 's/^#UseDNS.*$/UseDNS no/' /etc/ssh/sshd_config" \
     --run-command "sed -i 's/^GSSAPIAuthentication.*$/GSSAPIAuthentication no/' /etc/ssh/sshd_config" \
@@ -70,6 +71,7 @@ LIBGUESTFS_BACKEND=direct virt-customize \
     --upload ${BUILD_ROOT}/set_perf_images.sh:/home/stack \
     --upload ${BUILD_DIR}/image.py:/root \
     --upload ${BUILD_DIR}/image.pyc:/root \
+    --run-command "sed -i '/pkg_upgrade_cmd =/c\\    \$pkg_upgrade_cmd =echo' /usr/share/instack-undercloud/puppet-stack-config/puppet-stack-config.pp" \
     -a undercloud_build.qcow2
 
 mv -f undercloud_build.qcow2 undercloud.qcow2

diff --git a/build/variables.sh b/build/variables.sh
index d9f3471..0aedff9 100644 (file)
--- a/build/variables.sh
+++ b/build/variables.sh
@@ -50,4 +50,4 @@ congress_pkg=openstack-congress-2016.1-1.git${congress_commit}$(rpm -E %dist).no
 netvpp_repo="https://github.com/openstack/networking-vpp"
 netvpp_branch="master"
 netvpp_commit=$(git ls-remote ${netvpp_repo} ${netvpp_branch} | awk '{print substr($1,1,7)}')
-netvpp_pkg=networking-vpp-0.0.1-1.git${NETVPP_COMMIT}$(rpm -E %dist).noarch.rpm
+netvpp_pkg=python-networking-vpp-0.0.1-1.git${NETVPP_COMMIT}$(rpm -E %dist).noarch.rpm