summaryrefslogtreecommitdiffstats
path: root/deploy/conf
diff options
context:
space:
mode:
authorhu xinhui <xinhui_hu@foxmail.com>2018-02-06 10:20:40 +0800
committerhu xinhui <xinhui_hu@foxmail.com>2018-02-09 13:26:16 +0800
commit04612cd0b3ee0ef6764a1a99299da52348b49e35 (patch)
tree90a2ef0da66b084ed35553c026200835749c8032 /deploy/conf
parent26f656961306239075612ac75a92b79db44e1539 (diff)
change k8s version to v1.9.1
JIRA: - 1. compass4nfv can deploy v1.9.1 kubernetes 2. end user can use the kubernetes dashboard Change-Id: I274dda38599da95f382dfcb4159b530da8422fd8 Signed-off-by: hu xinhui <xinhui_hu@foxmail.com>
Diffstat (limited to 'deploy/conf')
-rw-r--r--deploy/conf/cluster.conf1
1 files changed, 1 insertions, 0 deletions
diff --git a/deploy/conf/cluster.conf b/deploy/conf/cluster.conf
index c7a708b9..0d947100 100644
--- a/deploy/conf/cluster.conf
+++ b/deploy/conf/cluster.conf
@@ -24,6 +24,7 @@ export ADAPTER_NAME="openstack_$OPENSTACK_VERSION"
export ADAPTER_FLAVOR_PATTERN="HA-ansible-multinodes-$OPENSTACK_VERSION"
if [[ "x"$KUBERNETES_VERSION != "x" ]]; then
+ unset OPENSTACK_VERSION
export ADAPTER_NAME=kubernetes
export ADAPTER_FLAVOR_PATTERN=ansible-kubernetes
export ADAPTER_TARGET_SYSTEM_PATTERN='^kubernetes$'