Edit the deploy.sh

Change-Id: I611abbd6a1265fc397c8af4f2131e5e073ad91bb
Signed-off-by: liyuenan <liyuenan@huawei.com>

10 files changed, 207 insertions, 235 deletions

diff --git a/add.sh b/add.sh
deleted file mode 100755
index cf537fc9..00000000
--- a/add.sh
+++ /dev/null
@@ -1,53 +0,0 @@
-#!/bin/bash
-##############################################################################
-# Copyright (c) 2016 HUAWEI TECHNOLOGIES CO.,LTD and others.
-#
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Apache License, Version 2.0
-# which accompanies this distribution, and is available at
-# http://www.apache.org/licenses/LICENSE-2.0
-##############################################################################
-
-# ISO_URL is your iso's absolute path
-# 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=
-
-# DHA is your dha.yml's path
-# export DHA=/home/compass4nfv/deploy/conf/vm_environment/os-nosdn-nofeature-ha.yml
-export DHA=
-
-# NETWORK is your network.yml's path
-# export NETWORK=/home/compass4nfv/deploy/conf/vm_environment/huawei-virtual1/network.yml
-export NETWORK=
-
-# node number when you virtual deploy
-# export VIRT_NUMBER=5
-
-########## Ubuntu14.04 Mitaka ##########
-export OS_VERSION=trusty
-export OPENSTACK_VERSION=mitaka
-
-########## Ubuntu16.04 Mitaka ##########
-# export OS_VERSION=xenial
-# export OPENSTACK_VERSION=mitaka_xenial
-
-########## Centos7 Mitaka ##########
-# export OS_VERSION=centos7
-# export OPENSTACK_VERSION=mitaka
-
-##########Deploy or Expansion##########
-export EXPANSION="true"
-export MANAGEMENT_IP_START="10.1.0.55"
-export VIRT_NUMBER=1
-
-########## Hardware Deploy Jumpserver PXE NIC ##########
-# you need comment out it when virtual deploy
-# export INSTALL_NIC=eth1
-
-########## Deploy or Redeploy ##########
-# export DEPLOY_HOST="true"
-export DEPLOY_FIRST_TIME="false"
-
-./deploy.sh
diff --git a/deploy.sh b/deploy.sh
index a5968966..64393cf0 100755
--- a/deploy.sh
+++ b/deploy.sh
@@ -7,6 +7,78 @@
 # which accompanies this distribution, and is available at
 # http://www.apache.org/licenses/LICENSE-2.0
 ##############################################################################
+
+# ISO_URL is your iso's absolute path
+# 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=
+
+# DHA is your dha.yml's path
+# export DHA=/home/compass4nfv/deploy/conf/vm_environment/os-nosdn-nofeature-ha.yml
+#export DHA=
+
+# NETWORK is your network.yml's path
+# export NETWORK=/home/compass4nfv/deploy/conf/vm_environment/huawei-virtual1/network.yml
+#export NETWORK=
+
+######################### The environment for Openstack ######################
+# Ubuntu16.04 Newton
+#export OS_VERSION=xenial
+#export OPENSTACK_VERSION=newton_xenial
+
+# Ubuntu14.04 Mitaka
+#export OS_VERSION=trusty
+#export OPENSTACK_VERSION=mitaka
+
+# Ubuntu16.04 Mitaka
+#export OS_VERSION=xenial
+#export OPENSTACK_VERSION=mitaka_xenial
+
+# Centos7 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
+
+######################### Virtual Deploy Nodes Number ########################
+# How many nodes do you need when virtual deploy. The default number is 5.
+#export VIRT_NUMBER=5
+
+######################### 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
diff --git a/deploy_compass.sh b/deploy_compass.sh
deleted file mode 100755
index d9895444..00000000
--- a/deploy_compass.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/bash
-##############################################################################
-# Copyright (c) 2016 HUAWEI TECHNOLOGIES CO.,LTD and others.
-#
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Apache License, Version 2.0
-# which accompanies this distribution, and is available at
-# http://www.apache.org/licenses/LICENSE-2.0
-##############################################################################
-export DEPLOY_COMPASS=${DEPLOY_COMPASS-"true"}
-
-./deploy.sh $*
diff --git a/deploy_host.sh b/deploy_host.sh
deleted file mode 100755
index 9703feba..00000000
--- a/deploy_host.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/bash
-##############################################################################
-# Copyright (c) 2016 HUAWEI TECHNOLOGIES CO.,LTD and others.
-#
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Apache License, Version 2.0
-# which accompanies this distribution, and is available at
-# http://www.apache.org/licenses/LICENSE-2.0
-##############################################################################
-export DEPLOY_HOST=${DEPLOY_HOST-"true"}
-
-./deploy.sh $*
diff --git a/docs/installationprocedure/bmdeploy.rst b/docs/installationprocedure/bmdeploy.rst
index 6ec70fa4..3b294f1f 100644
--- a/docs/installationprocedure/bmdeploy.rst
+++ b/docs/installationprocedure/bmdeploy.rst
@@ -12,6 +12,9 @@ The below file is the inventory template of deployment nodes:
 
 "compass4nfv/deploy/conf/hardware_environment/huawei-pod1/dha.yml"
 
+The "dha.yml" is a collectively name for "os-nosdn-nofeature-ha.yml
+os-ocl-nofeature-ha.yml os-odl_l2-moon-ha.yml etc".
+
 You can write your own IPMI IP/User/Password/Mac address/roles reference to it.
 
         - name -- Host name for deployment node after installation.
@@ -205,7 +208,7 @@ You can write your own reference to it.
 Start Deployment (Bare Metal Deployment)
 ----------------------------------------
 
-1. Edit run.sh
+1. Edit deploy.sh
 
 Set OS version and OpenStack version for deployment nodes.
     Compass4nfv Colorado supports three OS version based openstack mitaka.
@@ -214,17 +217,26 @@ E.g.
 
 .. code-block:: bash
 
-    ########## Ubuntu14.04 Mitaka ##########
-    export OS_VERSION=trusty
-    export OPENSTACK_VERSION=mitaka
+    ######################### The environment for Openstack ######################
+    # Ubuntu16.04 Newton
+    #export OS_VERSION=xenial
+    #export OPENSTACK_VERSION=newton_xenial
+
+    # Ubuntu14.04 Mitaka
+    #export OS_VERSION=trusty
+    #export OPENSTACK_VERSION=mitaka
+
+    # Ubuntu16.04 Mitaka
+    #export OS_VERSION=xenial
+    #export OPENSTACK_VERSION=mitaka_xenial
 
-    ########## Ubuntu16.04 Mitaka ##########
-    # export OS_VERSION=xenial
-    # export OPENSTACK_VERSION=mitaka_xenial
+    # Centos7 Mitaka
+    #export OS_VERSION=centos7
+    #export OPENSTACK_VERSION=mitaka
 
-    ########## Centos7 Mitaka ##########
-    # export OS_VERSION=centos7
-    # export OPENSTACK_VERSION=mitaka
+    # Redhat7 OSP9
+    #export OS_VERSION=redhat7
+    #export OPENSTACK_VERSION=osp9
 
 Set ISO image that you want to deploy
 
@@ -321,8 +333,8 @@ onos-sfc deploy scenario sample
     # NETWORK is your network.yml's path
     export NETWORK=./deploy/conf/hardware_environment/huawei-pod1/network_onos.yml
 
-2. Run ``run.sh``
+2. Run ``deploy.sh``
 
 .. code-block:: bash
 
-    ./run.sh
+    ./deploy.sh
diff --git a/docs/installationprocedure/expansion.rst b/docs/installationprocedure/expansion.rst
index 1ffdafbd..697945ba 100644
--- a/docs/installationprocedure/expansion.rst
+++ b/docs/installationprocedure/expansion.rst
@@ -100,26 +100,54 @@ E.g. Increase two compute nodes
 Start Expansion
 ~~~~~~~~~~~~~~~
 
-1. Edit add.sh
+1. Edit deploy.sh
+
+Set the EXPANSION to true.
+
+E.g.
+
+.. code-block:: bash
+
+    ######################### 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"
+
 
 Set OS version and OpenStack version for deployment nodes.
-    Compass4nfv Colorado supports three OS version based openstack mitaka.
 
 E.g.
 
 .. code-block:: bash
 
-    ########## Ubuntu14.04 Mitaka ##########
-    export OS_VERSION=trusty
-    export OPENSTACK_VERSION=mitaka
+    ######################### The environment for Openstack ######################
+    # Ubuntu16.04 Newton
+    #export OS_VERSION=xenial
+    #export OPENSTACK_VERSION=newton_xenial
+
+    # Ubuntu14.04 Mitaka
+    #export OS_VERSION=trusty
+    #export OPENSTACK_VERSION=mitaka
+
+    # Ubuntu16.04 Mitaka
+    #export OS_VERSION=xenial
+    #export OPENSTACK_VERSION=mitaka_xenial
 
-    ########## Ubuntu16.04 Mitaka ##########
-    # export OS_VERSION=xenial
-    # export OPENSTACK_VERSION=mitaka_xenial
+    # Centos7 Mitaka
+    #export OS_VERSION=centos7
+    #export OPENSTACK_VERSION=mitaka
 
-    ########## Centos7 Mitaka ##########
-    # export OS_VERSION=centos7
-    # export OPENSTACK_VERSION=mitaka
+    # Redhat7 OSP9
+    #export OS_VERSION=redhat7
+    #export OPENSTACK_VERSION=osp9
 
 NOTE:
 The OS version and OpenStack version should be same as the first deployment.
@@ -135,6 +163,9 @@ E.g.
     # or
     # export ISO_URL=http://artifacts.opnfv.org/compass4nfv/colorado/opnfv-colorado.1.0.iso
 
+NOTE:
+The ISO should be same as the first deployment.
+
 Set scenario that you want to expansion
 
 E.g.
@@ -147,14 +178,6 @@ E.g.
     # NETWORK is your network.yml's path
     export NETWORK=./deploy/conf/hardware_environment/huawei-pod1/network.yml
 
-Comment out VIRT_NUMBER when bare metal expansion
-
-E.g.
-
-.. code-block:: bash
-
-    #export VIRT_NUMBER=1
-
 Set jumpserver PXE NIC
 
 E.g.
@@ -165,11 +188,11 @@ E.g.
 
 Check the environment variable.
 
-2. Run ``add.sh``
+2. Run ``deploy.sh``
 
 .. code-block:: bash
 
-    ./add.sh
+    ./deploy.sh
 
 Virtual Expansion
 -----------------
@@ -232,24 +255,51 @@ Start Expansion
 
 1. Edit add.sh
 
+Set the EXPANSION to true.
+
+E.g.
+
+.. code-block:: bash
+
+    ######################### 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"
+
 Set OS version and OpenStack version for deployment nodes.
-    Compass4nfv Colorado supports three OS version based openstack mitaka.
 
 E.g.
 
 .. code-block:: bash
 
-    ########## Ubuntu14.04 Mitaka ##########
-    export OS_VERSION=trusty
-    export OPENSTACK_VERSION=mitaka
+    ######################### The environment for Openstack ######################
+    # Ubuntu16.04 Newton
+    #export OS_VERSION=xenial
+    #export OPENSTACK_VERSION=newton_xenial
+
+    # Ubuntu14.04 Mitaka
+    #export OS_VERSION=trusty
+    #export OPENSTACK_VERSION=mitaka
 
-    ########## Ubuntu16.04 Mitaka ##########
-    # export OS_VERSION=xenial
-    # export OPENSTACK_VERSION=mitaka_xenial
+    # Ubuntu16.04 Mitaka
+    #export OS_VERSION=xenial
+    #export OPENSTACK_VERSION=mitaka_xenial
 
-    ########## Centos7 Mitaka ##########
-    # export OS_VERSION=centos7
-    # export OPENSTACK_VERSION=mitaka
+    # Centos7 Mitaka
+    #export OS_VERSION=centos7
+    #export OPENSTACK_VERSION=mitaka
+
+    # Redhat7 OSP9
+    #export OS_VERSION=redhat7
+    #export OPENSTACK_VERSION=osp9
 
 NOTE:
 The OS version and OpenStack version should be same as the first deployment.
@@ -265,6 +315,9 @@ E.g.
     # or
     # export ISO_URL=http://artifacts.opnfv.org/compass4nfv/colorado/opnfv-colorado.1.0.iso
 
+NOTE:
+The OS version and OpenStack version should be same as the first deployment.
+
 Set scenario that you want to expansion
 
 E.g.
@@ -277,26 +330,10 @@ E.g.
     # NETWORK is your network.yml's path
     export NETWORK=./deploy/conf/vm_environment/huawei-virtual1/network.yml
 
-Set nodes number need to expansion
-
-E.g.
-
-.. code-block:: bash
-
-    export VIRT_NUMBER=1
-
-Comment out NIC when virtual expansion
-
-E.g.
-
-.. code-block:: bash
-
-    #INSTALL_NIC=${INSTALL_NIC:-eth1}
-
 Check the environment variable.
 
-2. Run ``add.sh``
+2. Run ``deploy.sh``
 
 .. code-block:: bash
 
-    ./add.sh
+    ./deploy.sh
diff --git a/docs/installationprocedure/vmdeploy.rst b/docs/installationprocedure/vmdeploy.rst
index cb5df6fb..54d7863e 100644
--- a/docs/installationprocedure/vmdeploy.rst
+++ b/docs/installationprocedure/vmdeploy.rst
@@ -10,7 +10,10 @@ Nodes Configuration (Virtual Deployment)
 
 The below file is the inventory template of deployment nodes:
 
-"./deploy/conf/vm_environment/huawei-virtual1/network.yml"
+"./deploy/conf/vm_environment/huawei-virtual1/dha.yml"
+
+The "dha.yml" is a collectively name for "os-nosdn-nofeature-ha.yml
+os-ocl-nofeature-ha.yml os-odl_l2-moon-ha.yml etc".
 
 You can write your own address/roles reference to it.
 
@@ -147,7 +150,7 @@ You can write your own reference to it.
 Start Deployment (Virtual Deployment)
 -------------------------------------
 
-1. Edit run.sh
+1. Edit deploy.sh
 
 Set OS version and OpenStack version for deployment nodes.
     Compass4nfv Colorado supports three OS version based openstack mitaka.
@@ -156,17 +159,26 @@ E.g.
 
 .. code-block:: bash
 
-    ########## Ubuntu14.04 Mitaka ##########
-    export OS_VERSION=trusty
-    export OPENSTACK_VERSION=mitaka
+    ######################### The environment for Openstack ######################
+    # Ubuntu16.04 Newton
+    #export OS_VERSION=xenial
+    #export OPENSTACK_VERSION=newton_xenial
+
+    # Ubuntu14.04 Mitaka
+    #export OS_VERSION=trusty
+    #export OPENSTACK_VERSION=mitaka
+
+    # Ubuntu16.04 Mitaka
+    #export OS_VERSION=xenial
+    #export OPENSTACK_VERSION=mitaka_xenial
 
-    ########## Ubuntu16.04 Mitaka ##########
-    # export OS_VERSION=xenial
-    # export OPENSTACK_VERSION=mitaka_xenial
+    # Centos7 Mitaka
+    #export OS_VERSION=centos7
+    #export OPENSTACK_VERSION=mitaka
 
-    ########## Centos7 Mitaka ##########
-    # export OS_VERSION=centos7
-    # export OPENSTACK_VERSION=mitaka
+    # Redhat7 OSP9
+    #export OS_VERSION=redhat7
+    #export OPENSTACK_VERSION=osp9
 
 Set ISO image that you want to deploy
 
@@ -253,8 +265,8 @@ onos-sfc deploy scenario sample
     # NETWORK is your network.yml's path
     export NETWORK=./deploy/conf/vm_environment/huawei-virtual1/network_onos.yml
 
-2. Run ``run.sh``
+2. Run ``deploy.sh``
 
 .. code-block:: bash
 
-    ./run.sh
+    ./deploy.sh
diff --git a/recovery.sh b/recovery.sh
deleted file mode 100755
index 1b188620..00000000
--- a/recovery.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/bash
-##############################################################################
-# Copyright (c) 2016 HUAWEI TECHNOLOGIES CO.,LTD and others.
-#
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Apache License, Version 2.0
-# which accompanies this distribution, and is available at
-# http://www.apache.org/licenses/LICENSE-2.0
-##############################################################################
-
-export DEPLOY_RECOVERY="true"
-export DEPLOY_FIRST_TIME="false"
-
-./run.sh
-
diff --git a/redeploy_host.sh b/redeploy_host.sh
deleted file mode 100755
index 703c8229..00000000
--- a/redeploy_host.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/bash
-##############################################################################
-# Copyright (c) 2016 HUAWEI TECHNOLOGIES CO.,LTD and others.
-#
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Apache License, Version 2.0
-# which accompanies this distribution, and is available at
-# http://www.apache.org/licenses/LICENSE-2.0
-##############################################################################
-export REDEPLOY_HOST=${REDEPLOY_HOST-"true"}
-
-./deploy.sh $*
diff --git a/run.sh b/run.sh
deleted file mode 100755
index 98631452..00000000
--- a/run.sh
+++ /dev/null
@@ -1,57 +0,0 @@
-#!/bin/bash
-##############################################################################
-# Copyright (c) 2016 HUAWEI TECHNOLOGIES CO.,LTD and others.
-#
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Apache License, Version 2.0
-# which accompanies this distribution, and is available at
-# http://www.apache.org/licenses/LICENSE-2.0
-##############################################################################
-
-# ISO_URL is your iso's absolute path
-# 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=
-
-# DHA is your dha.yml's path
-# export DHA=/home/compass4nfv/deploy/conf/vm_environment/os-nosdn-nofeature-ha.yml
-export DHA=
-
-# NETWORK is your network.yml's path
-# export NETWORK=/home/compass4nfv/deploy/conf/vm_environment/huawei-virtual1/network.yml
-export NETWORK=
-
-# node number when you virtual deploy
-# export VIRT_NUMBER=5
-
-########## Ubuntu16.04 Newton ##########
-# export OS_VERSION=xenial
-# export OPENSTACK_VERSION=newton_xenial
-
-########## Ubuntu14.04 Mitaka ##########
-export OS_VERSION=trusty
-export OPENSTACK_VERSION=mitaka
-
-########## Ubuntu16.04 Mitaka ##########
-# export OS_VERSION=xenial
-# export OPENSTACK_VERSION=mitaka_xenial
-
-########## Centos7 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
-
-########## Deploy or Redeploy ##########
-# export DEPLOY_HOST="true"
-# export DEPLOY_FIRST_TIME="false"
-
-./deploy.sh
-