document update for Fraser release.

[joid.git] / docs / release / userguide / userguide.rst

diff --git a/docs/release/userguide/userguide.rst b/docs/release/userguide/userguide.rst
index 7ef9d63..5b829f0 100644 (file)
--- a/docs/release/userguide/userguide.rst
+++ b/docs/release/userguide/userguide.rst
@@ -1,7 +1,7 @@
 
 Introduction
 ============
-This document will explain how to install OPNFV Danube with JOID including installing JOID, configuring JOID for your environment, and deploying OPNFV with different SDN solutions in HA, or non-HA mode. Prerequisites include
+This document will explain how to install OPNFV Fraser with JOID including installing JOID, configuring JOID for your environment, and deploying OPNFV with different SDN solutions in HA, or non-HA mode. Prerequisites include
 
 - An Ubuntu 16.04 LTS Server Jumphost
 - Minimum 2 Networks per Pharos requirement
@@ -172,7 +172,7 @@ opnfv:
   release: d
   distro: xenial
   type: noha
-  openstack: newton
+  openstack: pike
   sdncontroller:
   - type: nosdn
   storage:
@@ -227,11 +227,11 @@ HA or non-HA mode. For OpenStack, it supports Juno and Liberty. For SDN, it supp
 vSwitch, OpenContrail, OpenDaylight and ONOS (Open Network Operating System). In addition
 to HA or non-HA mode, it also supports deploying the latest from the development tree (tip).
 
-The deploy.sh script in the joid/ci directoy will do all the work for you. For example, the following deploys OpenStack Newton with OpenvSwitch in a HA mode.
+The deploy.sh script in the joid/ci directoy will do all the work for you. For example, the following deploys OpenStack Pike with OpenvSwitch in a HA mode.
 
 ::
 
-  ~/joid/ci$  ./deploy.sh -o newton -s nosdn -t ha -l custom -f none -m openstack
+  ~/joid/ci$  ./deploy.sh -o pike -s nosdn -t ha -l custom -f none -m openstack
 
 The deploy.sh script in the joid/ci directoy will do all the work for you. For example, the following deploys Kubernetes with Load balancer on the pod.
 
@@ -251,8 +251,8 @@ Take a look at the deploy.sh script. You will find we support the following for
     ha: HA mode of OpenStack.
     tip: The tip of the development.
   [-o]
-    mitak: OpenStack Mitaka version.
-    newton: OpenStack Newton version.
+    ocata: OpenStack Ocata version.
+    pike: OpenStack Pike version.
   [-l]
     default: For virtual deployment where installation will be done on KVM created using ./03-maasdeploy.sh
     custom: Install on bare metal OPNFV defined by labconfig.yaml
@@ -417,7 +417,7 @@ The following are the common issues we have collected from the community:
 
 ::
 
-       ./deploy.sh -o newton -s nosdn -t ha -l custom -f none
+       ./deploy.sh -o pike -s nosdn -t ha -l custom -f none
 
 - If you have setup maas not with 03-maasdeploy.sh then the ./clean.sh command could hang,
   the juju status command may hang because the correct MAAS API keys are not mentioned in
@@ -510,9 +510,9 @@ The function configOpenrc() creates the OpenStack login credentials, the functio
  create_openrc() {
     keystoneIp=$(keystoneIp)
     if [[ "$jujuver" < "2" ]]; then
-        adminPasswd=$(juju get keystone | grep admin-password -A 5 | grep value | awk '{print $2}' 2> /dev/null)
+        adminPasswd=$(juju get keystone | grep admin-password -A 7 | grep value | awk '{print $2}' 2> /dev/null)
     else
-        adminPasswd=$(juju config keystone | grep admin-password -A 5 | grep value | awk '{print $2}' 2> /dev/null)
+        adminPasswd=$(juju config keystone | grep admin-password -A 7 | grep value | awk '{print $2}' 2> /dev/null)
     fi
 
     configOpenrc admin $adminPasswd admin http://$keystoneIp:5000/v2.0 RegionOne > ~/joid_config/admin-openrc
@@ -656,9 +656,7 @@ This section creates a private network for the instances. Please change accordin
 ::
 
   neutron router-create demo-router
-
   neutron router-interface-add demo-router demo-subnet
-
   neutron router-gateway-set demo-router ext-net
 
 This section creates a router and connects this router to the two networks we just created.