bugfix: set env varibal ADAPTER_OS_PATTERN according to OS_VERSION 03/11103/2
authorcarey.xu <carey.xuhan@huawei.com>
Fri, 11 Mar 2016 08:43:13 +0000 (16:43 +0800)
committerJustin chi <chigang@huawei.com>
Fri, 11 Mar 2016 09:35:17 +0000 (09:35 +0000)
JIRA: COMPASS-340

Change-Id: Ia676623ac7e19a4455aa911e2df7ac788e9b4f9e
Signed-off-by: carey.xu <carey.xuhan@huawei.com>
deploy/conf/cluster.conf

index f741895..cae78be 100644 (file)
@@ -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"}