summaryrefslogtreecommitdiffstats
path: root/docs/release/installation
diff options
context:
space:
mode:
Diffstat (limited to 'docs/release/installation')
-rw-r--r--docs/release/installation/index.rst2
-rw-r--r--docs/release/installation/installation_guide.rst10
-rw-r--r--docs/release/installation/introduction.rst2
-rw-r--r--docs/release/installation/recovery.rst86
-rw-r--r--docs/release/installation/upgrade.rst4
5 files changed, 95 insertions, 9 deletions
diff --git a/docs/release/installation/index.rst b/docs/release/installation/index.rst
index 611ecf63..3080e14b 100644
--- a/docs/release/installation/index.rst
+++ b/docs/release/installation/index.rst
@@ -8,7 +8,7 @@ OPNFV Daisy4nfv Installation Guide
**********************************
.. toctree::
- :numbered:
+ :numbered:
:maxdepth: 4
introduction.rst
diff --git a/docs/release/installation/installation_guide.rst b/docs/release/installation/installation_guide.rst
index 3017f1cd..e600443e 100644
--- a/docs/release/installation/installation_guide.rst
+++ b/docs/release/installation/installation_guide.rst
@@ -4,7 +4,7 @@
Daisy4nfv configuration
=======================
-This document provides guidelines on how to install and configure the Euphrates
+This document provides guidelines on how to install and configure the Fraser
release of OPNFV when using Daisy as a deployment tool including required
software and hardware configurations.
@@ -17,7 +17,7 @@ networking and Unix/Linux administration.
Prerequisites
-------------
-Before starting the installation of the Euphrates release of OPNFV, some plannings
+Before starting the installation of the Fraser release of OPNFV, some plannings
must be done.
@@ -33,7 +33,7 @@ The daily build iso image can be retrieved via OPNFV artifact repository:
http://artifacts.opnfv.org/daisy.html
-NOTE: Search the keyword "daisy/Euphrates" to locate the iso image.
+NOTE: Search the keyword "daisy/Fraser" to locate the iso image.
E.g.
daisy/opnfv-2017-10-06_09-50-23.iso
@@ -52,9 +52,9 @@ To retrieve the repository of Daisy on Jumphost use the following command:
- git clone https://gerrit.opnfv.org/gerrit/daisy
-To get stable Euphrates release, you can use the following command:
+To get stable Fraser release, you can use the following command:
-- git checkout euphrates.1.0
+- git checkout opnfv.6.0
Setup Requirements
diff --git a/docs/release/installation/introduction.rst b/docs/release/installation/introduction.rst
index cf7452f9..882c5d77 100644
--- a/docs/release/installation/introduction.rst
+++ b/docs/release/installation/introduction.rst
@@ -4,7 +4,7 @@
Abstract
========
-This document describes how to install the Euphrates release of OPNFV when using
+This document describes how to install the Fraser release of OPNFV when using
Daisy4nfv as a deployment tool covering it's limitations, dependencies and
required resources.
diff --git a/docs/release/installation/recovery.rst b/docs/release/installation/recovery.rst
index 432936bf..eb9be8b2 100644
--- a/docs/release/installation/recovery.rst
+++ b/docs/release/installation/recovery.rst
@@ -78,3 +78,89 @@ Daisy deployment command as follows(in the Daisy VM):
This basically does kolla-ansible destruction and kolla-asnible deployment.
+
+4. Recovery Level 3
+-------------------
+
+If previous deployment was failed during kolla-ansible deploy(you can confirm
+it by checking /var/log/daisy/api.log) or if previous deployment was successful
+but the default configration is not what you want and it is OK for you to destroy
+the OPNFV software stack and re-deploy it again, then you can try recovery level 3.
+
+For example, in order to use external iSCSI storage, you are about to deploy
+iSCSI cinder backend which is not enabled by default. First, cleanup the
+previous deployment.
+
+ssh into daisy node, then do:
+
+
+.. code-block:: console
+
+ [root@daisy daisy]# source /etc/kolla/admin-openrc.sh
+ [root@daisy daisy]# openstack server delete <all vms you created>
+
+
+
+
+Note: /etc/kolla/admin-openrc.sh may not have existed if previous
+deployment was failed during kolla deploy.
+
+
+.. code-block:: console
+
+ [root@daisy daisy]# cd /home/kolla_install/kolla-ansible/
+ [root@daisy kolla-ansible]# ./tools/kolla-ansible destroy \
+ -i ./ansible/inventory/multinode --yes-i-really-really-mean-it
+
+
+
+
+Then, edit /etc/kolla/globals.yml and append the follwoing line:
+
+
+.. code-block:: console
+
+ enable_cinder_backend_iscsi: "yes"
+ enable_cinder_backend_lvm: "no"
+
+
+
+
+Then, re-deploy again:
+
+
+.. code-block:: console
+
+
+ [root@daisy kolla-ansible]# ./tools/kolla-ansible prechecks -i ./ansible/inventory/multinode
+ [root@daisy kolla-ansible]# ./tools/kolla-ansible deploy -i ./ansible/inventory/multinode
+
+
+
+
+After successfully deploying, issue the following command to generate
+/etc/kolla/admin-openrc.sh file.
+
+
+.. code-block:: console
+
+
+ [root@daisy kolla-ansible]# ./tools/kolla-ansible post-deploy -i ./ansible/inventory/multinode
+
+
+
+
+Finally, issue the following command to create necessary resources, and your
+environment are ready for running OPNFV functest.
+
+
+.. code-block:: console
+
+
+ [root@daisy kolla-ansible]# cd /home/daisy
+ [root@daisy daisy]# ./deploy/post.sh -n /home/daisy/labs/zte/virtual1/daisy/config/network.yml
+
+
+
+
+Note: "zte/virtual1" in above path may vary in your environment.
diff --git a/docs/release/installation/upgrade.rst b/docs/release/installation/upgrade.rst
index 65d49315..a74a4683 100644
--- a/docs/release/installation/upgrade.rst
+++ b/docs/release/installation/upgrade.rst
@@ -4,14 +4,14 @@
OpenStack Minor Version Update Guide
====================================
-Thanks for the Kolla's kolla-ansible upgrade function, Daisy enable to
+Thanks to Kolla's kolla-ansible upgrade function, Daisy can
update OpenStack minor version as the follows:
1. Get new version file only from Daisy team.
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
+found at http://artifacts.opnfv.org/daisy/upstream, or please
see :ref:`this chapter <daisy-build-kolla-image>`
for how to build your own image.