From: carey.xu <carey.xuhan@huawei.com>
Date: Wed, 16 Dec 2015 07:30:07 +0000 (+0800)
Subject: default deploy openstack version swith to liberty
X-Git-Tag: brahmaputra.1.0~121
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=f6ab1777425407be147878bbdd54f1852075d1b2;p=compass4nfv.git

default deploy openstack version swith to liberty

JIRA: COMPASS-204

Change-Id: I3a591bab2903c09c73e546f4e78c2e252beed546
Signed-off-by: carey.xu <carey.xuhan@huawei.com>
---

diff --git a/deploy/conf/cluster.conf b/deploy/conf/cluster.conf
index 09a8aae4..f5ccdf30 100644
--- a/deploy/conf/cluster.conf
+++ b/deploy/conf/cluster.conf
@@ -2,25 +2,18 @@
 export ADAPTER_OS_PATTERN=${ADAPTER_OS_PATTERN:-'(?i)ubuntu-14\.04\.3.*'}
 #export ADAPTER_OS_PATTERN=${ADAPTER_OS_PATTERN:-'(?i)CentOS-7.*1503-01.*'}
 
-# don't touch this
-export ADAPTER_TARGET_SYSTEM_PATTERN="^openstack$"
-
+# trustry/centos7
+export OS_VERSION=${OS_VERSION:-"trusty"}
 
-# for openstack juno
-export REPO_NAME=${REPO_NAME:-"trusty-juno-ppa"}
-export ADAPTER_NAME="openstack_juno"
-export ADAPTER_FLAVOR_PATTERN="HA-ansible-multinodes-juno"
+# liberty/kilo/juno
+export OPENSTACK_VERSION=${OPENSTACK_VERSION:-"liberty"}
 
+# don't touch this
+export ADAPTER_TARGET_SYSTEM_PATTERN="^openstack$"
 
-# for openstack kilo
-#export REPO_NAME=${REPO_NAME:-"trusty-liberty-ppa"}
-#export ADAPTER_NAME="openstack_liberty"
-#export ADAPTER_FLAVOR_PATTERN="HA-ansible-multinodes-liberty"
-
-# for openstack kilo on Centos7
-#export REPO_NAME=${REPO_NAME:-"centos7-kilo-ppa"}
-#export ADAPTER_NAME="openstack_kilo"
-#export ADAPTER_FLAVOR_PATTERN="HA-ansible-multinodes-kilo"
+export REPO_NAME="$OS_VERSION-$OPENSTACK_VERSION-ppa"
+export ADAPTER_NAME="openstack_$OPENSTACK_VERSION"
+export ADAPTER_FLAVOR_PATTERN="HA-ansible-multinodes-$OPENSTACK_VERSION"
 
 export DEFAULT_ROLES=""
 export VIP="10.1.0.222"