From 15405530cd0b27f7e2f27d5c889b561569057057 Mon Sep 17 00:00:00 2001 From: Zhijiang Hu Date: Mon, 25 Sep 2017 23:27:00 -0400 Subject: securelab parameter bug fix This is a bug fix of 02e1f1c8ab3f3857ca2370f98575ccbf41f12a01 Change-Id: I628c5e33a76bc28e0af139e338b29a7393700525 Signed-off-by: Zhijiang Hu --- docs/release/installation/bmdeploy.rst | 9 ++++++++- docs/release/installation/vmdeploy.rst | 3 ++- 2 files changed, 10 insertions(+), 2 deletions(-) (limited to 'docs') 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 (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 -- cgit 1.2.3-korg