From 2e33f30a1f0a17692d6d0348248df10b98cfb498 Mon Sep 17 00:00:00 2001 From: liyuenan Date: Sat, 14 Jan 2017 11:31:08 +0800 Subject: 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 --- deploy/conf/cluster.conf | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'deploy/conf') 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" -- cgit 1.2.3-korg