Add ENV to support rhel7.2 + osp9

JIRA: -

Change-Id: Ie655add53b6f8cd3df7d4370e52b7920a3795df2
Signed-off-by: QiLiang <liangqi1@huawei.com>

diff --git a/deploy/conf/cluster.conf b/deploy/conf/cluster.conf
index 03566eb..9107eb8 100644 (file)
--- 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

diff --git a/run.sh b/run.sh
index bbf3ae0..9863145 100755 (executable)
--- a/run.sh
+++ b/run.sh
@@ -41,6 +41,10 @@ export OPENSTACK_VERSION=mitaka
 # export OS_VERSION=centos7
 # export OPENSTACK_VERSION=mitaka
 
+########## Redhat7 OSP9 ##########
+# export OS_VERSION=redhat7
+# export OPENSTACK_VERSION=osp9
+
 ########## Hardware Deploy Jumpserver PXE NIC ##########
 # you need comment out it when virtual deploy
 # export INSTALL_NIC=eth1