aboutsummaryrefslogtreecommitdiffstats
path: root/deploy/conf
diff options
context:
space:
mode:
authorchenshuai@huawei.com <chenshuai@huawei.com>2015-12-15 11:16:04 +0800
committerchenshuai@huawei.com <chenshuai@huawei.com>2015-12-15 11:16:04 +0800
commit5c3eda8b6b512bb1d1b2d9796437bb1976325af4 (patch)
tree534516150ab8aaaf574df1ebec85d2ef46095841 /deploy/conf
parent259ab35aff85183387c8424272fe9122e2a00a18 (diff)
bugfix: openstack version configuration
JIRA: COMPASS-201 Change-Id: I78dde13ebe3853252ec0d2b1736a3b86e8d06add Signed-off-by: chenshuai@huawei.com <chenshuai@huawei.com>
Diffstat (limited to 'deploy/conf')
-rw-r--r--deploy/conf/cluster.conf12
1 files changed, 10 insertions, 2 deletions
diff --git a/deploy/conf/cluster.conf b/deploy/conf/cluster.conf
index 200fae6..09a8aae 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=""