summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZhijiang Hu <hu.zhijiang@zte.com.cn>2017-06-27 00:39:20 -0400
committerroot <zhou.ya@zte.com.cn>2017-06-29 16:46:18 +0800
commitbc6f6d5f15b124859998c36f3e3cc013b77461e5 (patch)
tree869f30ba767aa95110664541e7f55baf4ae25d47
parente51c2fb37bcc4fb2c37dabd3f75cd4a6dc0ae169 (diff)
Initial merge of BM Installation guide
Change-Id: I9964f0d75ae879c6b86d245f2007841236a0b931 Signed-off-by: Zhijiang Hu <hu.zhijiang@zte.com.cn>
-rw-r--r--deploy/config/bm_environment/zte-baremetal1/deploy.yml6
-rw-r--r--docs/installationprocedure/bmdeploy.rst139
-rw-r--r--docs/installationprocedure/vmdeploy.rst2
3 files changed, 138 insertions, 9 deletions
diff --git a/deploy/config/bm_environment/zte-baremetal1/deploy.yml b/deploy/config/bm_environment/zte-baremetal1/deploy.yml
index d24a9569..b8584251 100644
--- 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'
roles:
- 'CONTROLLER_LB'
-- name: 'controller02'
- roles:
- - 'CONTROLLER_LB'
-- name: 'controller03'
- roles:
- - 'CONTROLLER_LB'
- name: 'computer01'
roles:
- 'COMPUTER'
diff --git a/docs/installationprocedure/bmdeploy.rst b/docs/installationprocedure/bmdeploy.rst
index 76d02ba6..5bf576d2 100644
--- 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 6c57ded8..6bcf0ab7 100644
--- 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"