detail deploy guide rst

Change-Id: I0a3dddb1356a8f50f9d0a35d69c39b7a483b7a20
Signed-off-by: zhouya <zhou.ya@zte.com.cn>

2 files changed, 61 insertions, 15 deletions

diff --git a/docs/release/installation/bmdeploy.rst b/docs/release/installation/bmdeploy.rst
index 47a8e121..ddb30f22 100644
--- a/docs/release/installation/bmdeploy.rst
+++ b/docs/release/installation/bmdeploy.rst
@@ -130,13 +130,33 @@ 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
+(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. Check the https://build.opnfv.org/ci/job/daisy-os-odl-nofeature-ha-baremetal-daily-master/,
+and if the 'snaps_health_check' of functest result is 'PASS',
+you can use this verify-passed bin to deploy the openstack in your own environment
+
+(3) Assumed cloned dir is $workdir, which laid out like below:
+[root@daisyserver daisy]# ls
+ci    deploy      docker  INFO         LICENSE    requirements.txt       templates   tests  tox.ini
+code  deploy.log  docs    known_hosts  setup.py   test-requirements.txt  tools
+Make sure the opnfv.bin file is in $workdir
+
+(4) Enter into the $workdir, which laid out like below:
+[root@daisyserver daisy]# ls
+ci  code  deploy  docker  docs  INFO  LICENSE  requirements.txt  setup.py  templates  test-requirements.txt  tests  tools  tox.ini
+Create folder of labs/zte/pod2/daisy/config in $workdir
+
+(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.
 
-(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.
+Note:
+If selinux is disabled on the host, please delete all xml files section of below lines in dir templates/physical_environment/vms/
+  <seclabel type='dynamic' model='selinux' relabel='yes'>
+    <label>system_u:system_r:svirt_t:s0:c182,c195</label>
+    <imagelabel>system_u:object_r:svirt_image_t:s0:c182,c195</imagelabel>
+  </seclabel>
 
 (6) Config the bridge in jumperserver,make sure the daisy vm can connect to the targetnode,use the command below:
 brctl addbr br7
@@ -147,4 +167,5 @@ 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"
+(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/release/installation/vmdeploy.rst b/docs/release/installation/vmdeploy.rst
index 5da3949b..64d16a96 100644
--- a/docs/release/installation/vmdeploy.rst
+++ b/docs/release/installation/vmdeploy.rst
@@ -134,20 +134,45 @@ HeartBeat network is selected,and if it is configured in network.yml,the keepali
 Start Deployment (Virtual Deployment)
 -------------------------------------
 
-(1) Git clone the latest daisy4nfv code from opnfv: "git clone https://gerrit.opnfv.org/gerrit/daisy"
+(1) Git clone the latest daisy4nfv code from opnfv: "git clone https://gerrit.opnfv.org/gerrit/daisy",
+make sure the current branch is master
 
-(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
+(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. Check the https://build.opnfv.org/ci/job/daisy-os-odl-nofeature-ha-baremetal-daily-master/,
+and if the 'snaps_health_check' of functest result is 'PASS',
+you can use this verify-passed bin to deploy the openstack in your own environment
 
-(3) Make sure the opnfv.bin file is in daisy4nfv code dir
+(3) Assumed cloned dir is $workdir, which laid out like below:
+[root@daisyserver daisy]# ls
+ci  code  deploy  docker  docs  INFO  LICENSE  requirements.txt  setup.py  templates  test-requirements.txt  tests  tools  tox.ini
+Make sure the opnfv.bin file is in $workdir
 
-(4) Create folder of labs/zte/virtual1/daisy/config in daisy4nfv code dir
+(4) Enter into $workdir, Create folder of labs/zte/virtual1/daisy/config in $workdir
 
-(5) Move the daisy/deploy/config/vm_environment/zte-virtual1/deploy.yml and daisy/deploy/config/vm_environment/zte-virtual1/network.yml to labs/zte/virtual1/daisy/config dir.
+(5) Move the deploy/config/vm_environment/zte-virtual1/deploy.yml and
+deploy/config/vm_environment/zte-virtual1/network.yml to
+labs/zte/virtual1/daisy/config dir.
 
 Note:
-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
+zte-virtual1 config file deploy openstack with five nodes(3 lb nodes and 2 computer nodes),
+if you want to deploy an all-in-one openstack, change the zte-virtual1 to zte-virtual2
+
+Note:
+If selinux is disabled on the host, please delete all xml files section of below lines in dir templates/virtual_environment/vms/
+  <seclabel type='dynamic' model='selinux' relabel='yes'>
+    <label>system_u:system_r:svirt_t:s0:c182,c195</label>
+    <imagelabel>system_u:object_r:svirt_image_t:s0:c182,c195</imagelabel>
+  </seclabel>
 
 (6) Run the script deploy.sh in daisy/ci/deploy/ with command:
-sudo ./ci/deploy/deploy.sh -b ../daisy  -l zte -p virtual1 -s os-nosdn-nofeature-noha
+sudo ./ci/deploy/deploy.sh -b ./ -l zte -p virtual1 -s os-nosdn-nofeature-ha
+
+Note:
+The value after -p parameter(virtual1) is get from labs/zte/virtual1/daisy/config/
+The value after -l parameter(zte) is get from labs/
+The value after -s "os-nosdn-nofeature-ha" used for deploy multinode openstack
+The value after -s "os-nosdn-nofeature-noha" used for deploy all-in-one openstack
 
-(7) When deploy successfully,the floating ip of openstack is 10.20.11.11,the login account is "admin" and the password is "keystone"
+(7) When deploy successfully,the floating ip of openstack is 10.20.11.11,
+the login account is "admin" and the password is "keystone"