From 108714f8009dc9889ff16d0acce514eb7273853f Mon Sep 17 00:00:00 2001 From: "carey.xu" Date: Fri, 11 Mar 2016 16:43:13 +0800 Subject: bugfix: set env varibal ADAPTER_OS_PATTERN according to OS_VERSION JIRA: COMPASS-340 Change-Id: Ia676623ac7e19a4455aa911e2df7ac788e9b4f9e Signed-off-by: carey.xu --- deploy/conf/cluster.conf | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'deploy/conf/cluster.conf') diff --git a/deploy/conf/cluster.conf b/deploy/conf/cluster.conf index f741895b..cae78be3 100644 --- a/deploy/conf/cluster.conf +++ b/deploy/conf/cluster.conf @@ -1,10 +1,13 @@ -# for Operating System -export ADAPTER_OS_PATTERN=${ADAPTER_OS_PATTERN:-'(?i)ubuntu-14\.04\.3.*'} -#export ADAPTER_OS_PATTERN=${ADAPTER_OS_PATTERN:-'(?i)CentOS-7.*15.*'} - # trustry/centos7 export OS_VERSION=${OS_VERSION:-"trusty"} +# for Operating System +if [ $OS_VERSION = 'trusty' ];then + export ADAPTER_OS_PATTERN=${ADAPTER_OS_PATTERN:-'(?i)ubuntu-14\.04\.3.*'} +else + export ADAPTER_OS_PATTERN=${ADAPTER_OS_PATTERN:-'(?i)CentOS-7.*15.*'} +fi + # liberty/kilo/juno export OPENSTACK_VERSION=${OPENSTACK_VERSION:-"liberty"} -- cgit 1.2.3-korg