diff options
| author |   liyuenan <liyuenan@huawei.com> | 2017-01-14 11:31:08 +0800 |
|---|---|---|
| committer |   Justin chi <chigang@huawei.com> | 2017-01-14 05:48:28 +0000 |
| commit | 2e33f30a1f0a17692d6d0348248df10b98cfb498 (patch) | |
| tree | 1f8d3612a4667bf977db5ce5a0cbe0696f06e78b /deploy/conf | |
| parent | 1da2cee07a11d5dd7b83ab0437807fc239929f1c (diff) | |
Deploy OpenStack Newton on CentOS hosts
JIRA: COMPASS-518
Make Centos Newton ppa.
Update host Centos version to 7.3.
Support Centos Newton Deploy.
Support Ceph Deploy.
Change-Id: I6dd110cc10d425a9d590e1dcb5777ade5cce96aa
Signed-off-by: liyuenan <liyuenan@huawei.com>
Diffstat (limited to 'deploy/conf')
| -rw-r--r-- | deploy/conf/cluster.conf | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/deploy/conf/cluster.conf b/deploy/conf/cluster.conf index ad21dcd8..e0c5655b 100644 --- a/deploy/conf/cluster.conf +++ b/deploy/conf/cluster.conf @@ -5,7 +5,7 @@ export OS_VERSION=${OS_VERSION:-"xenial"} if [ $OS_VERSION = 'xenial' ]; then export ADAPTER_OS_PATTERN=${ADAPTER_OS_PATTERN:-'(?i)ubuntu-16\.04'} else - export ADAPTER_OS_PATTERN=${ADAPTER_OS_PATTERN:-'(?i)CentOS-7.*15.*'} + export ADAPTER_OS_PATTERN=${ADAPTER_OS_PATTERN:-'(?i)CentOS-7.*16.*'} fi # newton @@ -14,7 +14,12 @@ export OPENSTACK_VERSION=${OPENSTACK_VERSION:-"newton"} # don't touch this export ADAPTER_TARGET_SYSTEM_PATTERN="^openstack$" -export REPO_NAME="$OS_VERSION-$OPENSTACK_VERSION-ppa" +if [ $OS_VERSION = 'centos7' ]; then + unset REPO_NAME +else + export REPO_NAME="$OS_VERSION-$OPENSTACK_VERSION-ppa" +fi + export ADAPTER_NAME="openstack_$OPENSTACK_VERSION" export ADAPTER_FLAVOR_PATTERN="HA-ansible-multinodes-$OPENSTACK_VERSION" |