From 045df4334e3bc3e9b9558408bf083925f70380ce Mon Sep 17 00:00:00 2001 From: "Jingzhao.Ni" Date: Mon, 10 Jun 2019 21:01:07 +0800 Subject: [PATCH] Declare NODE_NAME environment variable Undeclaring NODE_NAME parameter results in the wrong network configuration used which will cause deploying failure when deploying hosts. In this patch, "arm-virtual-host" will be assigned to NODE_NAME for fixing this error. At the same time, a bug in iec installation script was resolved. Signed-off-by: Jingzhao.Ni Change-Id: I79b638cfa41e650e0c08e601a8efb7635922cca0 --- jjb/iec/iec-compass-deploy.sh | 5 ++++- jjb/iec/iec-fdn-install.sh | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/jjb/iec/iec-compass-deploy.sh b/jjb/iec/iec-compass-deploy.sh index e77810b..f5cc64d 100755 --- a/jjb/iec/iec-compass-deploy.sh +++ b/jjb/iec/iec-compass-deploy.sh @@ -11,10 +11,13 @@ sed -i "33,90d" deploy/adapters/ansible/kubernetes/ansible-kubernetes.yml export ADAPTER_OS_PATTERN='(?i)ubuntu-16.04.*arm.*' export OS_VERSION="xenial" export KUBERNETES_VERSION="v1.13.0" + +NODE_NAME="${NODE_NAME:-arm-virtual-host}" + if [[ "$NODE_NAME" =~ "-virtual" ]]; then export DHA="deploy/conf/vm_environment/k8-nosdn-nofeature-noha.yml" export NETWORK="deploy/conf/vm_environment/network.yml" - export VIRT_NUMBER=3 VIRT_CPUS=2 VIRT_MEM=4096 VIRT_DISK=50G + export VIRT_NUMBER=3 VIRT_CPUS=2 VIRT_MEM=8192 VIRT_DISK=50G fi ./deploy.sh diff --git a/jjb/iec/iec-fdn-install.sh b/jjb/iec/iec-fdn-install.sh index 75697ef..40852df 100755 --- a/jjb/iec/iec-fdn-install.sh +++ b/jjb/iec/iec-fdn-install.sh @@ -16,7 +16,7 @@ sed -i "/^HOST_USER=/cHOST_USER=\${HOST_USER:-root}" ./config sed -i "s/10.169.40.106,123456/10.1.0.51,root\"\n\"10.1.0.52,root/g" ./config HOST_USER=root export HOST_USER -sudo ./startup.sh +./startup.sh exit 0 -- 2.16.6