From 41f223520b4fa21e49068d1bfe64aefd2fd46d86 Mon Sep 17 00:00:00 2001 From: "Jingzhao.Ni" Date: Wed, 12 Jun 2019 23:27:34 +0800 Subject: [PATCH] Remove the NODE_NAME judgement in compass scripts Remove the NODE_NAME judgement in the scripts. Signed-off-by: Jingzhao.Ni Change-Id: I348f09e961f75e534f69b9e34867bce011d6c531 --- jjb/iec/iec-compass-deploy.sh | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/jjb/iec/iec-compass-deploy.sh b/jjb/iec/iec-compass-deploy.sh index f5cc64d..17b74cb 100755 --- a/jjb/iec/iec-compass-deploy.sh +++ b/jjb/iec/iec-compass-deploy.sh @@ -12,13 +12,9 @@ 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=8192 VIRT_DISK=50G -fi +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=8192 VIRT_DISK=50G ./deploy.sh -- 2.16.6