diff options
| author |   HU Xinhui <xinhui_hu@foxmail.com> | 2018-02-11 02:15:10 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2018-02-11 02:15:10 +0000 |
| commit | 5dd3af7fd00971a96d91397f9754e6455abb660d (patch) | |
| tree | aa44494eb9ba542f391a2dab9036ebc8f3dbe526 /deploy/conf | |
| parent | bb9f83caad0d76277144d53caabe43fd317ce268 (diff) | |
| parent | 04612cd0b3ee0ef6764a1a99299da52348b49e35 (diff) | |
Merge "change k8s version to v1.9.1"
Diffstat (limited to 'deploy/conf')
| -rw-r--r-- | deploy/conf/cluster.conf | 1 |
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$' |