Add OpenStack reconfig and Upgrade docs

Change-Id: I971cc23d47b90cbf03b194d3e6918262b5e3f8a5
Signed-off-by: Zhijiang Hu <hu.zhijiang@zte.com.cn>

5 files changed, 149 insertions, 3 deletions

diff --git a/docs/release/configguide/index.rst b/docs/release/configguide/index.rst
index 7b531f45..a4829422 100644
--- a/docs/release/configguide/index.rst
+++ b/docs/release/configguide/index.rst
@@ -13,4 +13,4 @@ Release notes for Daisy4nfv
    :maxdepth: 2
 
    installerconfig.rst
-
+   kollaconfig.rst
diff --git a/docs/release/configguide/installerconfig.rst b/docs/release/configguide/installerconfig.rst
index 10fa9ad8..a8ef8144 100644
--- a/docs/release/configguide/installerconfig.rst
+++ b/docs/release/configguide/installerconfig.rst
@@ -10,7 +10,7 @@
 Abstract
 ========
 
-This document compiles the release notes for the D 2.0 release of
+This document compiles the release notes for the E 1.0 release of
 OPNFV when using Daisy as a deployment tool.
 
 
diff --git a/docs/release/configguide/kollaconfig.rst b/docs/release/configguide/kollaconfig.rst
new file mode 100644
index 00000000..6da50ed3
--- /dev/null
+++ b/docs/release/configguide/kollaconfig.rst
@@ -0,0 +1,56 @@
+
+.. This document is protected/licensed under the following conditions
+.. (c) Sun Jing (ZTE corporation)
+.. Licensed under a Creative Commons Attribution 4.0 International License.
+.. You should have received a copy of the license along with this work.
+.. If not, see <http://creativecommons.org/licenses/by/4.0/>.
+
+
+OpenStack Configuration Guide
+=============================
+
+Before The First Deployment
+---------------------------
+
+When executing deploy.sh, before doing real deployment, Daisy utilizes
+Kolla's service configuration functionality [1] to specify the following
+changes to the default OpenStack configuration which comes from Kolla as
+default.
+
+a) If is it is a VM deployment, set virt_type=qemu amd cpu_mode=none for
+nova-compute.conf.
+
+b) In nova-api.conf set default_floating_pool to the name of the external
+network which will be created by Daisy after deployment for nova-api.conf.
+
+c) In heat-api.conf and heat-engine.conf, set deferred_auth_method to
+trusts and unset trusts_delegated_roles.
+
+Those above changes are requirements of OPNFV or environment's
+constraints.  So it is not recommended to change them. But if the user
+wants to add more specific configurations to OpenStack services before
+doing real deployment, we suggest to do it in the same way as deploy.sh
+do. Currently, this means hacking into deploy/prepare.sh or
+deploy/prepare/execute.py then add config file as described in [1].
+
+Notes:
+Suggest to pass the first deployment first, then reconfigure and deploy
+again.
+
+
+After The First Deployment
+--------------------------
+
+After the first time of deployment of OpenStack, its configurations can
+also be changed and applied by using Kolla's service configuration
+functionality [1]. But user has to issue Kolla's command to do it in this
+release:
+
+
+.. code-block:: console
+    cd /home/kolla_install/kolla-ansible/
+    ./tools/kolla-ansible reconfigure -i /home/kolla_install/kolla-ansible/ansible/inventory/multinode
+
+
+
+[1] https://docs.openstack.org/kolla-ansible/latest/advanced-configuration.html#openstack-service-configuration-in-kolla
diff --git a/docs/release/installation/index.rst b/docs/release/installation/index.rst
index a4836e53..20d1e3b7 100644
--- a/docs/release/installation/index.rst
+++ b/docs/release/installation/index.rst
@@ -16,4 +16,4 @@ OPNFV Daisy4nfv Installation Guide
    bmdeploy.rst
    vmdeploy.rst
    recovery.rst
-
+   upgrade.rst
diff --git a/docs/release/installation/upgrade.rst b/docs/release/installation/upgrade.rst
new file mode 100644
index 00000000..8b9965c3
--- /dev/null
+++ b/docs/release/installation/upgrade.rst
@@ -0,0 +1,90 @@
+.. This work is licensed under a Creative Commons Attribution 4.0 International Licence.
+.. http://creativecommons.org/licenses/by/4.0
+
+OpenStack Minor Version Update Guide
+====================================
+
+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
+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://120.24.17.215/.
+
+2. Put new version file into /var/lib/daisy/kolla/, for example,
+/var/lib/daisy/kolla/kolla-image-ocata-170811155446.tgz
+
+3. Add version file to Daisy's version management database then get the
+version ID.
+
+
+.. code-block:: console
+
+    [root@daisy ~]# daisy version-add kolla-image-ocata-170811155446.tgz kolla
+    +-------------+--------------------------------------+
+    | Property    | Value                                |
+    +-------------+--------------------------------------+
+    | checksum    | None                                 |
+    | created_at  | 2017-08-28T06:45:25.000000           |
+    | description | None                                 |
+    | id          | 8be92587-34d7-43e8-9862-a5288c651079 |
+    | name        | kolla-image-ocata-170811155446.tgz   |
+    | owner       | None                                 |
+    | size        | 0                                    |
+    | status      | unused                               |
+    | target_id   | None                                 |
+    | type        | kolla                                |
+    | updated_at  | 2017-08-28T06:45:25.000000           |
+    | version     | None                                 |
+    +-------------+--------------------------------------+
+
+
+
+4. Get cluster ID
+
+
+.. code-block:: console
+
+    [root@daisy ~]# daisy cluster-list
+    +--------------------------------------+-------------+...
+    | ID                                   | Name        |...
+    +--------------------------------------+-------------+...
+    | d4c1e0d3-c4b8-4745-aab0-0510e62f0ebb | clustertest |...
+    +--------------------------------------+-------------+...
+
+
+
+5. Issuing update command passing cluster ID and version ID
+
+
+
+.. code-block:: console
+
+    [root@daisy ~]# daisy update d4c1e0d3-c4b8-4745-aab0-0510e62f0ebb --update-object kolla --version-id 8be92587-34d7-43e8-9862-a5288c651079
+    +----------+--------------+
+    | Property | Value        |
+    +----------+--------------+
+    | status   | begin update |
+    +----------+--------------+
+
+
+6. Since step 5's command is non-blocking, the user need to run the
+following command to get updating progress.
+
+
+
+.. code-block:: console
+
+    [root@daisy ~]# daisy host-list --cluster-id d4c1e0d3-c4b8-4745-aab0-0510e62f0ebb
+    ...+---------------+-------------+-------------------------+
+    ...| Role_progress | Role_status | Role_messages           |
+    ...+---------------+-------------+-------------------------+
+    ...| 0             | updating    | prechecking envirnoment |
+    ...+---------------+-------------+-------------------------+
+
+
+
+Notes. The above command returns many fields. User only have to take care
+about the Role_xxx fields in this case.