From a9041dbf7b68f56169e82de3c37601b7e86867b0 Mon Sep 17 00:00:00 2001
From: liyuenan <liyuenan@huawei.com>
Date: Tue, 20 Dec 2016 16:44:59 +0800
Subject: Change newton_xenial to newton

JIRA: COMPASS-513

Change-Id: I937a02bcd69f0df1f5d951dd6630ef2e76e8d386
Signed-off-by: liyuenan <liyuenan@huawei.com>
---
 deploy/conf/cluster.conf | 23 +++++------------------
 1 file changed, 5 insertions(+), 18 deletions(-)

(limited to 'deploy/conf/cluster.conf')

diff --git a/deploy/conf/cluster.conf b/deploy/conf/cluster.conf
index 9107eb8a..ad21dcd8 100644
--- a/deploy/conf/cluster.conf
+++ b/deploy/conf/cluster.conf
@@ -1,33 +1,20 @@
-# trustry/centos7
-export OS_VERSION=${OS_VERSION:-"trusty"}
+# xenial/centos7
+export OS_VERSION=${OS_VERSION:-"xenial"}
 
 # for Operating System
 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
 
-# liberty/kilo/juno
-export OPENSTACK_VERSION=${OPENSTACK_VERSION:-"liberty"}
+# newton
+export OPENSTACK_VERSION=${OPENSTACK_VERSION:-"newton"}
 
 # don't touch this
 export ADAPTER_TARGET_SYSTEM_PATTERN="^openstack$"
 
-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
-
+export REPO_NAME="$OS_VERSION-$OPENSTACK_VERSION-ppa"
 export ADAPTER_NAME="openstack_$OPENSTACK_VERSION"
 export ADAPTER_FLAVOR_PATTERN="HA-ansible-multinodes-$OPENSTACK_VERSION"
 
-- 
cgit 1.2.3-korg