summaryrefslogtreecommitdiffstats
path: root/deploy
diff options
context:
space:
mode:
authorQiLiang <liangqi1@huawei.com>2016-10-27 06:58:04 +0800
committerQiLiang <liangqi1@huawei.com>2016-10-27 07:03:47 +0800
commita605841f0428b2c1504b5a86074e2219ccc7df1e (patch)
treeaa96b29e95cca9795d04e39d205094fb02408f8a /deploy
parentdde596264dadaa3e530adc4e30f9205edfaff3ba (diff)
Add ENV to support rhel7.2 + osp9
JIRA: - Change-Id: Ie655add53b6f8cd3df7d4370e52b7920a3795df2 Signed-off-by: QiLiang <liangqi1@huawei.com>
Diffstat (limited to 'deploy')
-rw-r--r--deploy/conf/cluster.conf4
1 files changed, 4 insertions, 0 deletions
diff --git a/deploy/conf/cluster.conf b/deploy/conf/cluster.conf
index 03566eb9..9107eb8a 100644
--- a/deploy/conf/cluster.conf
+++ b/deploy/conf/cluster.conf
@@ -6,6 +6,8 @@ if [ $OS_VERSION = 'xenial' ]; then
export ADAPTER_OS_PATTERN=${ADAPTER_OS_PATTERN:-'(?i)ubuntu-16\.04'}
elif [ $OS_VERSION = 'trusty' ]; then
export ADAPTER_OS_PATTERN=${ADAPTER_OS_PATTERN:-'(?i)ubuntu-14\.04\.3.*'}
+elif [ $OS_VERSION = 'redhat7' ]; then
+ export ADAPTER_OS_PATTERN=${ADAPTER_OS_PATTERN:-'(?i)rhel-server-7\.2.*'}
else
export ADAPTER_OS_PATTERN=${ADAPTER_OS_PATTERN:-'(?i)CentOS-7.*15.*'}
fi
@@ -20,6 +22,8 @@ if [ $OPENSTACK_VERSION = 'mitaka_xenial' ]; then
export REPO_NAME="xenial-mitaka-ppa"
elif [ $OPENSTACK_VERSION = 'newton_xenial' ]; then
export REPO_NAME="xenial-newton-ppa"
+elif [ $OPENSTACK_VERSION = 'osp9' ]; then
+ unset REPO_NAME
else
export REPO_NAME="$OS_VERSION-$OPENSTACK_VERSION-ppa"
fi