aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJustin chi <chigang@huawei.com>2016-10-28 16:07:45 +0000
committerGerrit Code Review <gerrit@opnfv.org>2016-10-28 16:07:45 +0000
commitd0f8362d2fd29a0d8d853449f60d9bfd6406a91f (patch)
tree20a75d0a9a76b72c0843cbdc8f49b1f162d2c210
parent7a120938c5f7428954f9a52d6e885df1c04392ec (diff)
parenta605841f0428b2c1504b5a86074e2219ccc7df1e (diff)
Merge "Add ENV to support rhel7.2 + osp9"
-rw-r--r--deploy/conf/cluster.conf4
-rwxr-xr-xrun.sh4
2 files changed, 8 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
diff --git a/run.sh b/run.sh
index bbf3ae0e..98631452 100755
--- 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