summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--build/first-boot.yaml2
-rwxr-xr-xbuild/overcloud-opendaylight.sh2
-rw-r--r--build/ovs-dpdk-preconfig.yaml4
-rw-r--r--build/variables.sh4
-rwxr-xr-xlib/overcloud-deploy-functions.sh3
5 files changed, 8 insertions, 7 deletions
diff --git a/build/first-boot.yaml b/build/first-boot.yaml
index 6cd874cc..d4ac5df6 100644
--- a/build/first-boot.yaml
+++ b/build/first-boot.yaml
@@ -39,7 +39,7 @@ resources:
echo vm.hugetlb_shm_group=0 >> /usr/lib/sysctl.d/00-system.conf
echo vm.max_map_count=$(printf "%.0f" $(echo 2.2*$hugepage_count | bc)) >> /usr/lib/sysctl.d/00-system.conf
echo kernel.shmmax=$(($hugepage_count * 2 * 1024 * 1024)) >> /usr/lib/sysctl.d/00-system.conf
-
+ rm -f /etc/sysconfig/network-scripts/ifcfg-*
reboot
params:
$KERNEL_ARGS: {get_param: ComputeKernelArgs}
diff --git a/build/overcloud-opendaylight.sh b/build/overcloud-opendaylight.sh
index 7c78b6c4..d61c1f2e 100755
--- 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 ${CACHE_DIR}/odl-netvirt-vpp-distribution.tar.gz:/root/ \
-a overcloud-full-opendaylight_build.qcow2
diff --git a/build/ovs-dpdk-preconfig.yaml b/build/ovs-dpdk-preconfig.yaml
index d57b0b7a..a4663ff3 100644
--- a/build/ovs-dpdk-preconfig.yaml
+++ b/build/ovs-dpdk-preconfig.yaml
@@ -83,10 +83,10 @@ resources:
if [ -n "$SOCKET_MEMORY" ]; then
ovs-vsctl --no-wait set Open_vSwitch . other_config:dpdk-socket-mem=$SOCKET_MEMORY
fi
- if [ -n "$pmd_cpu_mask" ]; then
+ if [[ -n "$pmd_cpu_mask" && -n "$PMD_CORES" ]]; then
ovs-vsctl --no-wait set Open_vSwitch . other_config:pmd-cpu-mask=$pmd_cpu_mask
fi
- if [ -n "$dpdk_lcore_mask" ]; then
+ if [ -n "$dpdk_lcore_mask" && -n "$DPDK_CORES" ]]; then
ovs-vsctl --no-wait set Open_vSwitch . other_config:dpdk-lcore-mask=$dpdk_lcore_mask
fi
systemctl restart openvswitch
diff --git a/build/variables.sh b/build/variables.sh
index 23f25eb2..f577beca 100644
--- 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 77874dda..9017d3b1 100755
--- a/lib/overcloud-deploy-functions.sh
+++ b/lib/overcloud-deploy-functions.sh
@@ -123,9 +123,8 @@ 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" \
+ --run-command "systemctl enable bgpd" \
-a overcloud-full.qcow2
EOI
fi