Merge "Fixes bugs in ovs dpdk"

diff --git a/build/overcloud-opendaylight.sh b/build/overcloud-opendaylight.sh
index ca5ee06..4a6738b 100755 (executable)
--- a/build/overcloud-opendaylight.sh
+++ b/build/overcloud-opendaylight.sh
@@ -110,6 +110,8 @@ LIBGUESTFS_BACKEND=direct virt-customize \
     --run-command "yum downgrade -y python-zmq-14.3.1" \
     --install zeromq-4.1.4 \
     --install capnproto-libs,capnproto \
+    --run-command "cd /root/quagga; packages=\$(ls |grep -vE 'debuginfo|devel|contrib'); yum -y install \$packages" \
+    --run-command "sudo usermod -a -G quaggavt quagga" \
     --upload ${BUILD_ROOT}/patches/neutron-patch-NSDriver.patch:/usr/lib/python2.7/site-packages/ \
     --upload ${BUILD_ROOT}/patches/disable_odl_clustering.patch:/etc/puppet/modules/tripleo/ \
     --upload ${CACHE_DIR}/odl-netvirt-vpp-distribution.tar.gz:/root/ \

diff --git a/build/variables.sh b/build/variables.sh
index 23f25eb..f577bec 100644 (file)
--- a/build/variables.sh
+++ b/build/variables.sh
@@ -32,8 +32,8 @@ dpdk_rpms=(
 'ovs4opnfv-e8acab14-dpdk-tools-16.11-5.el7.centos.x86_64.rpm'
 )
 
-kvmfornfv_uri_base="http://artifacts.opnfv.org/kvmfornfv"
-kvmfornfv_kernel_rpm="kernel-4.4.6_rt14_1703030237nfv-1.x86_64.rpm"
+kvmfornfv_uri_base="http://artifacts.opnfv.org/kvmfornfv/danube"
+kvmfornfv_kernel_rpm="kvmfornfv-8e1bfc88-apex-kernel-4.4.50_rt62_centos.x86_64.rpm"
 
 tacker_repo="http://github.com/openstack/tacker"
 tacker_branch="stable/newton"

diff --git a/lib/overcloud-deploy-functions.sh b/lib/overcloud-deploy-functions.sh
index efacaf8..542e9cf 100755 (executable)
--- a/lib/overcloud-deploy-functions.sh
+++ b/lib/overcloud-deploy-functions.sh
@@ -123,8 +123,6 @@ EOI
       echo -e "${blue}INFO: Enabling ZRPC and Quagga${reset}"
       ssh -T ${SSH_OPTIONS[@]} "stack@$UNDERCLOUD" <<EOI
       LIBGUESTFS_BACKEND=direct virt-customize \
-         --run-command "cd /root/quagga; packages=\\\$(ls |grep -vE 'debuginfo|devel|contrib'); yum -y install \\\$packages" \
-         --run-command "sudo usermod -a -G quaggavt quagga" \
          --run-command "systemctl enable zrpcd" \
          -a overcloud-full.qcow2
 EOI