Initial merge of BM Installation guide

Change-Id: I9964f0d75ae879c6b86d245f2007841236a0b931
Signed-off-by: Zhijiang Hu <hu.zhijiang@zte.com.cn>

diff --git a/deploy/config/bm_environment/zte-baremetal1/deploy.yml b/deploy/config/bm_environment/zte-baremetal1/deploy.yml
index d24a956..b858425 100644 (file)
--- a/deploy/config/bm_environment/zte-baremetal1/deploy.yml
+++ b/deploy/config/bm_environment/zte-baremetal1/deploy.yml
@@ -3,12 +3,6 @@ hosts:
 - name: 'controller01'\r
   roles:\r
     - 'CONTROLLER_LB'\r
-- name: 'controller02'\r
-  roles:\r
-    - 'CONTROLLER_LB'\r
-- name: 'controller03'\r
-  roles:\r
-    - 'CONTROLLER_LB'\r
 - name: 'computer01'\r
   roles:\r
     - 'COMPUTER'\r

diff --git a/docs/installationprocedure/bmdeploy.rst b/docs/installationprocedure/bmdeploy.rst
index 76d02ba..5bf576d 100644 (file)
--- a/docs/installationprocedure/bmdeploy.rst
+++ b/docs/installationprocedure/bmdeploy.rst
@@ -1,7 +1,142 @@
-.. This work is licensed under a Creative Commons Attribution 4.0 International License.
+.. This work is licensed under a Creative Commons Attribution 4.0 International Licence.
 .. http://creativecommons.org/licenses/by/4.0
 
 Installation Guide (Bare Metal Deployment)
 ==========================================
 
-TODO
+Nodes Configuration (Bare Metal Deployment)
+-------------------------------------------
+
+The below file is the inventory template of deployment nodes:
+
+"./deploy/config/bm_environment/zte-baremetal1/deploy.yml"
+
+You can write your own name/roles reference into it.
+
+        - name -- Host name for deployment node after installation.
+
+        - roles -- Components deployed. CONTROLLER_LB is for Controller,
+COMPUTER is for Compute role. Currently only these two role is supported.
+The first CONTROLLER_LB is also used for ODL controller. 3 hosts in
+inventory will be chosen to setup the Ceph storage cluster.
+
+**Set TYPE and FLAVOR**
+
+E.g.
+
+.. code-block:: yaml
+
+    TYPE: virtual
+    FLAVOR: cluster
+
+**Assignment of different roles to servers**
+
+E.g. OpenStack only deployment roles setting
+
+.. code-block:: yaml
+
+    hosts:
+      - name: host1
+        roles:
+          - CONTROLLER_LB
+      - name: host2
+        roles:
+          - COMPUTER
+      - name: host3
+        roles:
+          - COMPUTER
+
+NOTE:
+WE JUST SUPPORT ONE CONTROLLER NODE NOW.
+
+Network Configuration (Bare Metal Deployment)
+------------------------------------------
+
+Before deployment, there are some network configurations to be checked based
+on your network topology. The default network configuration file for Daisy is
+"./deploy/config/bm_environment/zte-baremetal1/network.yml".
+You can write your own reference into it.
+
+**The following figure shows the default network configuration.**
+
+.. code-block:: console
+
+
+    +-B/M--------+------------------------------+
+    |Jumperserver+                              |
+    +------------+                       +--+   |
+    |                                    |  |   |
+    |                +-V/M--------+      |  |   |
+    |                | Daisyserver+------+  |   |
+    |                +------------+      |  |   |
+    |                                    |  |   |
+    +------------------------------------|  |---+
+                                         |  |
+                                         |  |
+          +--+                           |  |
+          |  |       +-B/M--------+      |  |
+          |  +-------+ Controller +------+  |
+          |  |       | ODL(Opt.)  |      |  |
+          |  |       | Network    |      |  |
+          |  |       | CephOSD1   |      |  |
+          |  |       +------------+      |  |
+          |  |                           |  |
+          |  |                           |  |
+          |  |                           |  |
+          |  |       +-B/M--------+      |  |
+          |  +-------+  Compute1  +------+  |
+          |  |       |  CephOSD2  |      |  |
+          |  |       +------------+      |  |
+          |  |                           |  |
+          |  |                           |  |
+          |  |                           |  |
+          |  |       +-B/M--------+      |  |
+          |  +-------+  Compute2  +------+  |
+          |  |       |  CephOSD3  |      |  |
+          |  |       +------------+      |  |
+          |  |                           |  |
+          |  |                           |  |
+          |  |                           |  |
+          +--+                           +--+
+            ^                             ^
+            |                             |
+            |                             |
+           /---------------------------\  |
+           |      External Network     |  |
+           \---------------------------/  |
+                  /-----------------------+---\
+                  |    Installation Network   |
+                  |    Public/Private API     |
+                  |      Internet Access      |
+                  |      Tenant Network       |
+                  |     Storage Network       |
+                  \---------------------------/
+
+
+
+
+Note: For Flat External networks(which is used by default), a physical interface is needed on each compute node for ODL NetVirt recent versions.
+
+Start Deployment (Bare Metal Deployment)
+----------------------------------------
+
+(1) Git clone the latest daisy4nfv code from opnfv: "git clone https://gerrit.opnfv.org/gerrit/daisy"
+
+(2) Download latest bin file(such as opnfv-2017-06-06_23-00-04.bin) of daisy from http://artifacts.opnfv.org/daisy.html and change the bin file name(such as opnfv-2017-06-06_23-00-04.bin) to opnfv.bin
+
+(3) Make sure the opnfv.bin file is in daisy4nfv code dir
+
+(4) Create folder of labs/zte/pod2/daisy/config in daisy4nfv code dir
+
+(5) Move the ./deploy/config/bm_environment/zte-baremetal1/deploy.yml and ./deploy/config/bm_environment/zte-baremetal1/network.yml to labs/zte/pod2/daisy/config dir.
+
+(6) Config the bridge in jumperserver,make sure the daisy vm can connect to the targetnode,use the command below:
+brctl addbr br7
+brctl addif br7 enp3s0f3(the interface for jumperserver to connect to daisy vm)
+ifconfig br7 10.20.7.1 netmask 255.255.255.0 up
+service network restart
+
+(7) Run the script deploy.sh in daisy/ci/deploy/ with command:
+sudo ./ci/deploy/deploy.sh -b ../daisy  -l zte -p pod2 -s os-nosdn-nofeature-noha
+
+(8) When deploy successfully,the floating ip of openstack is 10.20.7.11,the login account is "admin" and the password is "keystone"

diff --git a/docs/installationprocedure/vmdeploy.rst b/docs/installationprocedure/vmdeploy.rst
index 6c57ded..6bcf0ab 100644 (file)
--- a/docs/installationprocedure/vmdeploy.rst
+++ b/docs/installationprocedure/vmdeploy.rst
@@ -137,6 +137,6 @@ Start Deployment (Virtual Deployment)
 Notes:zte-virtual1 config file is just for all-in-one deployment,if you want to deploy openstack with five node(1 lb node and 4 computer nodes),change the zte-virtual1 to zte-virtual2
 
 (6) Run the script deploy.sh in daisy/ci/deploy/ with command:
-sudo ./ci/deploy/deploy.sh -b ../daisy  -l zte -p virtual1 -B pxebr
+sudo ./ci/deploy/deploy.sh -b ../daisy  -l zte -p virtual1 -s os-nosdn-nofeature-noha
 
 (7) When deploy successfully,the floating ip of openstack is 10.20.11.11,the login account is "admin" and the password is "keystone"