From 56615119dcd58dcecd66b6d83775af5580d97633 Mon Sep 17 00:00:00 2001
From: liyuenan <liyuenan@huawei.com>
Date: Wed, 22 Feb 2017 11:27:07 +0800
Subject: Update deploy.sh

JIRA: -

Remove some environment variables in deploy.sh, such as EXPANSION
DEPLOY_COMPASS DEPLOY_HOST DEPLOY_RECOVERY. Those environment
variables's instructions can be found in installation guide document.

Change-Id: I1a7a2e1ad48d7488793ef80742bad1dab47b4270
Signed-off-by: liyuenan <liyuenan@huawei.com>
---
 deploy.sh | 59 ++++++++++-------------------------------------------------
 1 file changed, 10 insertions(+), 49 deletions(-)

(limited to 'deploy.sh')

diff --git a/deploy.sh b/deploy.sh
index 74d14689..915e4b98 100755
--- a/deploy.sh
+++ b/deploy.sh
@@ -8,12 +8,18 @@
 # http://www.apache.org/licenses/LICENSE-2.0
 ##############################################################################
 
-# ISO_URL is your iso's absolute path
+# Set OS version for target hosts
+# Ubuntu16.04 or CentOS7
+#export OS_VERSION=xenial/centos7
+
+# Set ISO image corresponding to your code
 # export ISO_URL=file:///home/compass/compass4nfv.iso
-# or
-# export ISO_URL=http://artifacts.opnfv.org/compass4nfv/colorado/opnfv-colorado.1.0.iso
 #export ISO_URL=
 
+# Set hardware deploy jumpserver PXE NIC
+# You need to comment out it when virtual deploy.
+#export INSTALL_NIC=eth1
+
 # DHA is your dha.yml's path
 # export DHA=/home/compass4nfv/deploy/conf/vm_environment/os-nosdn-nofeature-ha.yml
 #export DHA=
@@ -22,52 +28,8 @@
 # export NETWORK=/home/compass4nfv/deploy/conf/vm_environment/huawei-virtual1/network.yml
 #export NETWORK=
 
-######################### The environment for Openstack ######################
-# Ubuntu16.04
-#export OS_VERSION=xenial
-
-# Centos7
-#export OS_VERSION=centos7
-
-#export OPENSTACK_VERSION=newton
-
-######################### Hardware Deploy Jumpserver PXE NIC ################
-# You need comment out it when virtual deploy.
-#export INSTALL_NIC=eth1
-
-######################### Virtual Deploy Nodes Number ########################
-# How many nodes do you need when virtual deploy. The default number is 5.
-#export VIRT_NUMBER=5
+export OPENSTACK_VERSION=${OPENSTACK_VERSION:-newton}
 
-######################### Deploy or Expansion ###############################
-# Modify network.yml and virtual_cluster_expansion.yml or
-# hardware_cluster_expansion.yml.
-# Edit the DHA and NETWORK envionment variables.
-# External subnet's ip_range and management ip should be changed as the
-# first 6 IPs are already taken by the first deployment.
-# VIRT_NUMBER decide how many virtual machines needs to expand when virtual expansion
-
-#export EXPANSION="true"
-#export MANAGEMENT_IP_START="10.1.0.55"
-#export VIRT_NUMBER=1
-#export DEPLOY_FIRST_TIME="false"
-
-######################### Deploy Compass ####################################
-# If you only need to deploy compass, set this variable.
-#export DEPLOY_COMPASS="true"
-
-######################### Deploy or Redeploy Host ###########################
-# If you only need to deploy host, set these variables.
-#export DEPLOY_HOST="true"
-#export REDEPLOY_HOST="true"
-
-######################### Reconvery #########################################
-# After restart jumpserver, set these variables and run deploy.sh again.
-#export DEPLOY_RECOVERY="true"
-#export DEPLOY_FIRST_TIME="false"
-
-
-#set -x
 COMPASS_DIR=`cd ${BASH_SOURCE[0]%/*}/;pwd`
 export COMPASS_DIR
 
@@ -77,4 +39,3 @@ if [[ -z $DEPLOY_COMPASS && -z $DEPLOY_HOST && -z $REDEPLOY_HOST ]]; then
 fi
 
 $COMPASS_DIR/deploy/launch.sh $*
-
-- 
cgit 1.2.3-korg