From: chenshuai@huawei.com <chenshuai@huawei.com>
Date: Sat, 16 Jul 2016 08:46:55 +0000 (-0400)
Subject: Support Ubuntu 16.04 + mitaka
X-Git-Tag: colorado.1.0~82
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F09%2F17009%2F1;p=compass4nfv.git

Support Ubuntu 16.04 + mitaka

JIRA: COMPASS-431

Change-Id: I28b9fc5ec6e55b4f4ef7fc01538b942e34a36b69
Signed-off-by: chenshuai@huawei.com <chenshuai@huawei.com>
---

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"