From: chenshuai@huawei.com <chenshuai@huawei.com>
Date: Tue, 15 Dec 2015 03:16:04 +0000 (+0800)
Subject: bugfix: openstack version configuration
X-Git-Tag: brahmaputra.1.0~126
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F27%2F4527%2F1;p=compass4nfv.git

bugfix: openstack version configuration

JIRA: COMPASS-201

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

diff --git a/deploy/conf/cluster.conf b/deploy/conf/cluster.conf
index 200fae65..09a8aae4 100644
--- a/deploy/conf/cluster.conf
+++ b/deploy/conf/cluster.conf
@@ -1,17 +1,25 @@
+# for Operating System
 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$"
 
+
+# for openstack juno
 export REPO_NAME=${REPO_NAME:-"trusty-juno-ppa"}
 export ADAPTER_NAME="openstack_juno"
 export ADAPTER_FLAVOR_PATTERN="HA-ansible-multinodes-juno"
+
+
+# for openstack kilo
 #export REPO_NAME=${REPO_NAME:-"trusty-liberty-ppa"}
 #export ADAPTER_NAME="openstack_liberty"
 #export ADAPTER_FLAVOR_PATTERN="HA-ansible-multinodes-liberty"
 
-#export ADAPTER_OS_PATTERN=${ADAPTER_OS_PATTERN:-'(?i)CentOS-7.*1503-01.*'}
+# for openstack kilo on Centos7
 #export REPO_NAME=${REPO_NAME:-"centos7-kilo-ppa"}
 #export ADAPTER_NAME="openstack_kilo"
-#export ADAPTER_TARGET_SYSTEM_PATTERN="^openstack$"
 #export ADAPTER_FLAVOR_PATTERN="HA-ansible-multinodes-kilo"
 
 export DEFAULT_ROLES=""