summaryrefslogtreecommitdiffstats
path: root/deploy
diff options
context:
space:
mode:
authorchenshuai@huawei.com <chenshuai@huawei.com>2016-07-16 04:46:55 -0400
committerchenshuai@huawei.com <chenshuai@huawei.com>2016-07-16 04:47:37 -0400
commita9255572f5c47eefc77ede9c51dff29bcad97d3c (patch)
treee97614ecc32b88d7db23f7c31d0dc1f00b0740ba /deploy
parentcbe32e01a56da7289d2348893dbafb90d373a787 (diff)
Support Ubuntu 16.04 + mitaka
JIRA: COMPASS-431 Change-Id: I28b9fc5ec6e55b4f4ef7fc01538b942e34a36b69 Signed-off-by: chenshuai@huawei.com <chenshuai@huawei.com>
Diffstat (limited to 'deploy')
-rw-r--r--deploy/conf/cluster.conf7
1 files changed, 6 insertions, 1 deletions
diff --git a/deploy/conf/cluster.conf b/deploy/conf/cluster.conf
index 69d8b435..5d41d53c 100644
--- a/deploy/conf/cluster.conf
+++ b/deploy/conf/cluster.conf
@@ -16,7 +16,12 @@ export OPENSTACK_VERSION=${OPENSTACK_VERSION:-"liberty"}
# don't touch this
export ADAPTER_TARGET_SYSTEM_PATTERN="^openstack$"
-export REPO_NAME="$OS_VERSION-$OPENSTACK_VERSION-ppa"
+if [ $OPENSTACK_VERSION = 'mitaka_xenial' ]; then
+ export REPO_NAME="xenial-mitaka-ppa"
+else
+ export REPO_NAME="$OS_VERSION-$OPENSTACK_VERSION-ppa"
+fi
+
export ADAPTER_NAME="openstack_$OPENSTACK_VERSION"
export ADAPTER_FLAVOR_PATTERN="HA-ansible-multinodes-$OPENSTACK_VERSION"