diff options
| author |   carey.xu <carey.xuhan@huawei.com> | 2015-12-16 15:30:07 +0800 |
|---|---|---|
| committer | carey.xu <carey.xuhan@huawei.com> | 2015-12-18 11:57:39 +0800 |
| commit | f6ab1777425407be147878bbdd54f1852075d1b2 (patch) | |
| tree | a2e0f35c158d4670f6f365d55bde841c9692859b | |
| parent | 3e93329b962a85147ccbce77a19ad4b3b93af51a (diff) | |
default deploy openstack version swith to liberty
JIRA: COMPASS-204
Change-Id: I3a591bab2903c09c73e546f4e78c2e252beed546
Signed-off-by: carey.xu <carey.xuhan@huawei.com>
| -rw-r--r-- | deploy/conf/cluster.conf | 25 |
1 files changed, 9 insertions, 16 deletions
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" |