Code Review / compass4nfv.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | patch | inline | side by side (parent: 68a1554)
Adjust DEPLOY_TOOL 89/56589/2
authorHarry Huang <huangxiangyu5@huawei.com>
Thu, 26 Apr 2018 04:04:06 +0000 (12:04 +0800)
committerHarry Huang <huangxiangyu5@huawei.com>
Tue, 8 May 2018 02:20:56 +0000 (02:20 +0000)
export DEPLOY_TOOL to k8s when scenario is
kubernetes

Change-Id: If186367bc31da46cf1d6190ba5eed3a9b6702957
Signed-off-by: Harry Huang <huangxiangyu5@huawei.com>
deploy/conf/cluster.conf patch | blob | history

diff --git a/deploy/conf/cluster.conf b/deploy/conf/cluster.conf
index 5178964..785d412 100644 (file)
--- a/deploy/conf/cluster.conf
+++ b/deploy/conf/cluster.conf
@@ -26,7 +26,7 @@ export ADAPTER_FLAVOR_PATTERN="HA-ansible-multinodes-$OPENSTACK_VERSION"
 
 if [[ "x"$KUBERNETES_VERSION != "x" ]]; then
     unset  OPENSTACK_VERSION
-    export DEPLOY_TOOL=${DEPLOY_TOOL:-"k8s"}
+    export DEPLOY_TOOL="k8s"
     export ADAPTER_NAME=kubernetes
     export ADAPTER_FLAVOR_PATTERN=ansible-kubernetes
     export ADAPTER_TARGET_SYSTEM_PATTERN='^kubernetes$'