diff options
Diffstat (limited to 'docs')
-rw-r--r-- | docs/release/installation/bmdeploy.rst | 8 | ||||
-rw-r--r-- | docs/release/installation/recovery.rst | 10 | ||||
-rw-r--r-- | docs/release/installation/upgrade.rst | 5 | ||||
-rw-r--r-- | docs/release/installation/vmdeploy.rst | 18 |
4 files changed, 20 insertions, 21 deletions
diff --git a/docs/release/installation/bmdeploy.rst b/docs/release/installation/bmdeploy.rst index cbdf62e5..82e3249d 100644 --- a/docs/release/installation/bmdeploy.rst +++ b/docs/release/installation/bmdeploy.rst @@ -16,7 +16,7 @@ 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. +COMPUTER is for Compute role. Currently only these two roles are supported. The first CONTROLLER_LB is also used for ODL controller. 3 hosts in inventory will be chosen to setup the Ceph storage cluster. @@ -171,8 +171,8 @@ 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 +The value after -s "os-nosdn-nofeature-ha" used for deploying multinode openstack +The value after -s "os-nosdn-nofeature-noha" used for deploying all-in-one openstack -(8) When deploy successfully,the floating ip of openstack is 10.20.7.11, +(8) When deployed 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/recovery.rst b/docs/release/installation/recovery.rst index 7a49e693..432936bf 100644 --- a/docs/release/installation/recovery.rst +++ b/docs/release/installation/recovery.rst @@ -23,15 +23,15 @@ virtual deployment(in the jump host): -If command failed because of Daisy VM creation error, then redo above command -will restart whole deployment which includes rebuild the daisy VM image and -restart Daisy VM. +If command failed because of Daisy VM creation error, then redoing above command +will restart whole deployment which includes rebuilding the daisy VM image and +restarting Daisy VM. 2. Recovery Level 1 ------------------- -If Daisy VM was created successfully, but bugs was encountered in Daisy code +If Daisy VM was created successfully, but bugs were encountered in Daisy code or software of target OS which prevent deployment from being done, in this case, the user or the developer does not want to recreate the Daisy VM again during next deployment process but just to modify some pieces of code in it. To achieve @@ -77,4 +77,4 @@ Daisy deployment command as follows(in the Daisy VM): -This basically do kolla-ansible destroy and kolla-asnible deploy. +This basically does kolla-ansible destruction and kolla-asnible deployment. diff --git a/docs/release/installation/upgrade.rst b/docs/release/installation/upgrade.rst index 164c72c9..65d49315 100644 --- a/docs/release/installation/upgrade.rst +++ b/docs/release/installation/upgrade.rst @@ -8,7 +8,7 @@ Thanks for the Kolla's kolla-ansible upgrade function, Daisy enable to update OpenStack minor version as the follows: 1. Get new version file only from Daisy team. -Since Daisy's Kolla images are build by meeting the OPNFV requirements +Since Daisy's Kolla images are built by meeting the OPNFV requirements and have their own file packaging layout, Daisy requires user to always use Kolla image file built by Daisy team. Currently, it can be got from http://artifacts.opnfv.org/daisy/upstream, or please @@ -60,8 +60,7 @@ version ID. -5. Issuing update command passing cluster ID and version ID - +5. Issue update command passing cluster ID and version ID .. code-block:: console diff --git a/docs/release/installation/vmdeploy.rst b/docs/release/installation/vmdeploy.rst index 12aa9ba8..97eebbf2 100644 --- a/docs/release/installation/vmdeploy.rst +++ b/docs/release/installation/vmdeploy.rst @@ -35,11 +35,11 @@ E.g. OpenStack only deployment roles setting hosts: - name: host1 roles: - - controller + - CONTROLLER_LB - name: host2 roles: - - compute + - COMPUTER NOTE: For B/M, Daisy uses MAC address defined in deploy.yml to map discovered nodes to node items definition in deploy.yml, @@ -155,7 +155,7 @@ deploy/config/vm_environment/zte-virtual1/network.yml to labs/zte/virtual1/daisy/config dir. Note: -zte-virtual1 config file deploy openstack with five nodes(3 lb nodes and 2 computer nodes), +zte-virtual1 config files 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: @@ -169,11 +169,11 @@ If selinux is disabled on the host, please delete all xml files section of below 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 -The value after -s "os-nosdn-nofeature-noha" used for deploy all-in-one openstack +The value after -L should be an absolute path which points to the directory which includes labs/zte/virtual1/daisy/config directory. +The value after -p parameter(virtual1) is got from labs/zte/virtual1/daisy/config/ +The value after -l parameter(zte) is got from labs/ +The value after -s "os-nosdn-nofeature-ha" used for deploying multinode openstack +The value after -s "os-nosdn-nofeature-noha" used for deploying all-in-one openstack -(7) When deploy successfully,the floating ip of openstack is 10.20.11.11, +(7) When deployed successfully,the floating ip of openstack is 10.20.11.11, the login account is "admin" and the password is "keystone" |