From 5c3eda8b6b512bb1d1b2d9796437bb1976325af4 Mon Sep 17 00:00:00 2001 From: "chenshuai@huawei.com" Date: Tue, 15 Dec 2015 11:16:04 +0800 Subject: bugfix: openstack version configuration JIRA: COMPASS-201 Change-Id: I78dde13ebe3853252ec0d2b1736a3b86e8d06add Signed-off-by: chenshuai@huawei.com --- deploy/conf/cluster.conf | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) 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="" -- cgit 1.2.3-korg