summaryrefslogtreecommitdiffstats
path: root/docs/release
diff options
context:
space:
mode:
authorZhijiang Hu <hu.zhijiang@zte.com.cn>2017-09-27 03:17:11 +0000
committerGerrit Code Review <gerrit@opnfv.org>2017-09-27 03:17:11 +0000
commit9ae8c5205831f1ccb3f379694ec170a077a61c79 (patch)
tree7b5fa8269ce886ec28fe455eb4a0764118f7d293 /docs/release
parent591b723e3d962c7d118497bbad4570eab8217390 (diff)
parent5393a8a75ed56443af366bae9565bce6a7d47391 (diff)
Merge "securelab parameter bug fix" into stable/euphrates
Diffstat (limited to 'docs/release')
-rw-r--r--docs/release/installation/bmdeploy.rst9
-rw-r--r--docs/release/installation/vmdeploy.rst3
2 files changed, 10 insertions, 2 deletions
diff --git a/docs/release/installation/bmdeploy.rst b/docs/release/installation/bmdeploy.rst
index ddb30f22..cbdf62e5 100644
--- a/docs/release/installation/bmdeploy.rst
+++ b/docs/release/installation/bmdeploy.rst
@@ -165,7 +165,14 @@ 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
+sudo ./ci/deploy/deploy.sh -L $(cd ./;pwd) -l zte -p pod2 -s os-nosdn-nofeature-noha
+
+Note:
+The value after -L should be a absolute path which points to the directory which contents labs/zte/pod2/daisy/config directory.
+The value after -p parameter(pod2) comes from path "labs/zte/pod2"
+The value after -l parameter(zte) comes from path "labs/zte"
+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
(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 64d16a96..12aa9ba8 100644
--- a/docs/release/installation/vmdeploy.rst
+++ b/docs/release/installation/vmdeploy.rst
@@ -166,9 +166,10 @@ If selinux is disabled on the host, please delete all xml files section of below
</seclabel>
(6) Run the script deploy.sh in daisy/ci/deploy/ with command:
-sudo ./ci/deploy/deploy.sh -b ./ -l zte -p virtual1 -s os-nosdn-nofeature-ha
+sudo ./ci/deploy/deploy.sh -L $(cd ./;pwd) -l zte -p virtual1 -s os-nosdn-nofeature-ha
Note:
+The value after -L should be a absolute path which points to the directory which contents labs/zte/virtual1/daisy/config directory.
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