summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTim Rozet <trozet@redhat.com>2017-03-27 13:22:45 -0400
committerTim Rozet <trozet@redhat.com>2017-04-09 02:47:28 +0000
commitd5a893088b4965806ae81dbc08ba2bf9da23a72e (patch)
tree0a5ee8e4f106c7e6ae406f6eede40ad8da86d7d2
parent1a10b8e7559ca75f5ac624d561303cf20bac9bc9 (diff)
nosdn fdio scenario fixes
- pins nosdn fdio packages that work - disable l3 agent ha mode opnfv-tht-pr: 130 Change-Id: I9470565768611f83cbd6e34f567a0aec58fa65ef Signed-off-by: Tim Rozet <trozet@redhat.com> Signed-off-by: Feng Pan <fpan@redhat.com> (cherry picked from commit 778593a0d93f1a994c58a30c2dfc3f2243bf1b2f)
-rwxr-xr-xbuild/overcloud-full.sh11
-rw-r--r--build/variables.sh8
-rwxr-xr-xlib/overcloud-deploy-functions.sh6
3 files changed, 24 insertions, 1 deletions
diff --git a/build/overcloud-full.sh b/build/overcloud-full.sh
index 9de6d9a..a1e0bfe 100755
--- a/build/overcloud-full.sh
+++ b/build/overcloud-full.sh
@@ -101,6 +101,13 @@ for package in ${fdio_l2_pkgs[@]}; do
fdio_l2_pkg_str+=" --upload ${BUILD_DIR}/${package}:/root/fdio_l2/"
done
+# FDIO packages frozen for nosdn scenarios
+fdio_nosdn_pkg_str=''
+for package in ${fdio_nosdn_pkgs[@]}; do
+ wget "$fdio_nosdn_uri_base/$package"
+ fdio_nosdn_pkg_str+=" --upload ${BUILD_DIR}/${package}:/root/fdio_nosdn/"
+done
+
# Increase disk size by 900MB to accommodate more packages
qemu-img resize overcloud-full_build.qcow2 +900MB
@@ -128,9 +135,11 @@ LIBGUESTFS_BACKEND=direct virt-customize \
$dpdk_pkg_str \
--run-command "mkdir /root/fdio_l3" \
--run-command "mkdir /root/fdio_l2" \
- --upload ${BUILD_DIR}/noarch/$netvpp_pkg:/root/fdio_l2 \
+ --run-command "mkdir /root/fdio_nosdn" \
+ --upload ${BUILD_DIR}/noarch/$netvpp_pkg:/root/fdio_nosdn \
$fdio_l3_pkg_str \
$fdio_l2_pkg_str \
+ $fdio_nosdn_pkg_str \
--run-command "yum install -y /root/fdio_l2/*.rpm" \
--run-command "yum install -y etcd" \
--install python-etcd \
diff --git a/build/variables.sh b/build/variables.sh
index 32d6aed..6064dc8 100644
--- a/build/variables.sh
+++ b/build/variables.sh
@@ -73,3 +73,11 @@ fdio_l2_pkgs=(
'vpp-lib-17.04-rc0~300_gdef19da~b1923.x86_64.rpm'
'vpp-plugins-17.04-rc0~300_gdef19da~b1923.x86_64.rpm'
)
+
+fdio_nosdn_uri_base=http://artifacts.opnfv.org/apex/danube/fdio_nosdn_rpms
+fdio_nosdn_pkgs=(
+'vpp-17.04-rc0~476_geaabe07~b2100.x86_64.rpm'
+'vpp-api-python-17.04-rc0~476_geaabe07~b2100.x86_64.rpm'
+'vpp-lib-17.04-rc0~476_geaabe07~b2100.x86_64.rpm'
+'vpp-plugins-17.04-rc0~476_geaabe07~b2100.x86_64.rpm'
+)
diff --git a/lib/overcloud-deploy-functions.sh b/lib/overcloud-deploy-functions.sh
index c6a97f2..ea30ccb 100755
--- a/lib/overcloud-deploy-functions.sh
+++ b/lib/overcloud-deploy-functions.sh
@@ -248,8 +248,13 @@ EOI
if [[ -z "${deploy_options_array['sdn_controller']}" || "${deploy_options_array['sdn_controller']}" == 'False' ]]; then
if [ "${deploy_options_array['dataplane']}" == "fdio" ]; then
if [ "$tenant_nic_mapping_controller_members" == "$tenant_nic_mapping_compute_members" ]; then
+ echo -e "${blue}INFO: nosdn fdio deployment...installing correct vpp packages...${reset}"
ssh -T ${SSH_OPTIONS[@]} "stack@$UNDERCLOUD" <<EOI
sed -i "/NeutronVPPAgentPhysnets:/c\ NeutronVPPAgentPhysnets: 'datacentre:${tenant_nic_mapping_controller_members}'" ${ENV_FILE}
+ LIBGUESTFS_BACKEND=direct virt-customize --run-command "yum remove -y vpp vpp-api-python vpp-lib vpp-plugins" \
+ --run-command "yum install -y /root/fdio_nosdn/*.rpm" \
+ --run-command "rm -f /etc/sysctl.d/80-vpp.conf" \
+ -a overcloud-full.qcow2
EOI
else
echo -e "${red}Compute and Controller must use the same tenant nic name, please modify network setting file.${reset}"
@@ -291,6 +296,7 @@ EOI
ssh -T ${SSH_OPTIONS[@]} "stack@$UNDERCLOUD" <<EOI
LIBGUESTFS_BACKEND=direct virt-customize --run-command "yum remove -y vpp vpp-api-python vpp-lib vpp-plugins honeycomb" \
--run-command "yum -y install /root/fdio_l3/*.rpm" \
+ --run-command "rm -f /etc/sysctl.d/80-vpp.conf" \
-a overcloud-full.qcow2
EOI
fi