qmodfied to add release notes for JOID.

Change-Id: Ide7c15e5430acf0b0895d6a96b122e8cc4369b99
Signed-off-by: Narinder Gupta <narinder.gupta@canonical.com>
(cherry picked from commit 2e9e51b5f258e5629e74d7de5197de9ed6e0dde4)

diff --git a/docs/installationprocedure/installationprocedure.rst b/docs/installationprocedure/installationprocedure.rst
index 7f46124..68a1595 100644 (file)
--- a/docs/installationprocedure/installationprocedure.rst
+++ b/docs/installationprocedure/installationprocedure.rst
@@ -65,7 +65,7 @@ brAdm and brPublic cat /etc/network/interfaces
 | ``   auto brPublic``
 | ``   iface brPublic inet static``
 | ``       address 10.2.66.2``
-| ``       netmask 255.255.255.0``
+| Seperate yaml fi ``       netmask 255.255.255.0``
 | ``       bridge_ports eth2``
 
 **NOTE: If you choose to use the separate network for management, data and
@@ -298,6 +298,18 @@ what feature to deploy. Comma seperated list
 which Ubuntu distro to use.
   [ -d <trusty|xenial> ]
 
+OPNFV Scenarios in JOID
+Following OPNFV scenarios can be deployed using JOID. Seperate yaml bundle will be created to deploy the individual scenario.
+
+Scenario                Owner          Known Issues
+os-nosdn-nofeature-ha   Joid    
+os-nosdn-nofeature-noha         Joid    
+os-odl_l2-nofeature-ha  Joid    
+os-nosdn-lxd-ha          Joid           Yardstick team is working to support.
+os-nosdn-lxd-noha        Joid           Yardstick team is working to support.
+os-onos-nofeature-ha    ONOSFW  
+os-onos-sfc-ha          ONOSFW  
+
 ------------
 Troubleshoot
 ------------
@@ -308,9 +320,9 @@ To Access of any control or compute nodes.
 juju ssh <service name>
 for example to login into openstack-dashboard container.
 
-*juju ssh openstack-dashboard/0
+juju ssh openstack-dashboard/0
 juju ssh nova-compute/0
-juju ssh neutron-gateway/0*
+juju ssh neutron-gateway/0
 
 By default juju will add the Ubuntu user keys for authentication into the deployed server and only ssh access will be available.
 

diff --git a/docs/releasenotes/release-notes.rst b/docs/releasenotes/release-notes.rst
index a2aa3fb..2bae1e3 100644 (file)
--- a/docs/releasenotes/release-notes.rst
+++ b/docs/releasenotes/release-notes.rst
@@ -58,15 +58,15 @@ Release Data
 |                                      |                                      |
 +--------------------------------------+--------------------------------------+
 | **Repo/tag**                         | gerrit.opnfv.org/gerrit/joid.git     |
-|                                      | stable/brahmaputra                   |
+|                                      | stable/colorado                      |
 +--------------------------------------+--------------------------------------+
-| **Release designation**              | Brahmaputra release                  |
+| **Release designation**              | Colorado release                     |
 |                                      |                                      |
 +--------------------------------------+--------------------------------------+
-| **Release date**                     | February 25 2016                     |
+| **Release date**                     | September 25 2016                    |
 |                                      |                                      |
 +--------------------------------------+--------------------------------------+
-| **Purpose of the delivery**          | Brahmaputra release                  |
+| **Purpose of the delivery**          | Colorado release                     |
 |                                      |                                      |
 +--------------------------------------+--------------------------------------+
 
@@ -91,13 +91,13 @@ Version change
 Module version change
 ~~~~~~~~~~~~~~~~~~~~~
   Brahmaputra release with the JOID deployment toolchain.
-  - OpenStack (Liberty release)
+  - OpenStack (Mitaka release)
   - OpenDaylight (Beryllium release)
-  - Ubuntu 14.04 LTS
+  - Ubuntu 16.04 LTS
 
 Document version change
 ~~~~~~~~~~~~~~~~~~~~~~~
-- OPNFV Installation instructions for the Brahmaputra release using JOID deployment
+- OPNFV Installation instructions for the Colorado release using JOID deployment
   toolchain - ver. 1.0.0
 - OPNFV Release Notes with the JOID deployment toolchain - ver. 1.0.0 (this document)
 
@@ -109,13 +109,16 @@ Feature additions
 
 +--------------------------------------+--------------------------------------+
 | **JIRA REFERENCE**                   | **SLOGAN**                           |
-|                                      |                                      |
 +--------------------------------------+--------------------------------------+
 | JIRA: JOID-1                         | use Juju and Ubuntu to deploy OPNFV  |
-|                                      |                                      |
 +--------------------------------------+--------------------------------------+
-| JIRA: JOID-23                        | explain how to deploy OPNFV R2       |
-|                                      | using JOID                           |
+| JIRA:        JOID-76                        | Integrate Aodh in JOID               |
++--------------------------------------+--------------------------------------+
+| JIRA:        JOID-69                        | OVS with DPDK                        |
++--------------------------------------+--------------------------------------+
+| JIRA:        JOID-68                        | ONOS Goldeneye Support               |
++--------------------------------------+--------------------------------------+
+| JIRA:        JOID-61                        | Mitaka OpenStack Support             |
 +--------------------------------------+--------------------------------------+
 
 Bug corrections
@@ -149,8 +152,8 @@ Known issues
 | **JIRA REFERENCE**                   | **SLOGAN**                           |
 |                                      |                                      |
 +--------------------------------------+--------------------------------------+
-| JIRA: JOID-19                        | juju(OPNFV) project integration with |
-|                                      | ONOSFW                               |
+| JIRA: YARDSTICK-325                  | Provide raw format yardstick vm image|
+|                                      | for nova-lxd scenario(OPNFV)         |
 +--------------------------------------+--------------------------------------+
 | JIRA:                                |                                      |
 +--------------------------------------+--------------------------------------+
@@ -163,13 +166,44 @@ See JIRA: <link>
 
 Test Result
 ===========
-Brahmaputra test result using JOID as deployment tool.
-<link>
+Colorado test result using JOID as deployment tool.
+- `https://build.opnfv.org/ci/view/joid/job/functest-joid-baremetal-daily-colorado/>`_
+- `https://build.opnfv.org/ci/view/joid/job/yardstick-joid-baremetal-daily-colorado/>`_
+
+Scenario Releases
+=================
+Name:      joid-os-nosdn-nofeature-ha
+Test Link: https://build.opnfv.org/ci/view/joid/job/joid-os-nosdn-nofeature-ha-baremetal-daily-colorado/
+Notes:
+
+Name:      joid-os-odl-nofeature-ha
+Test Link: https://build.opnfv.org/ci/view/joid/job/joid-os-odl_l2-nofeature-ha-baremetal-daily-colorado/
+Notes:
+
+Name:      joid-os-nosdn-lxd-ha
+Test Link: https://build.opnfv.org/ci/view/joid/job/joid-os-nosdn-lxd-ha-baremetal-daily-colorado/
+Notes:
+
+Name:      joid-os-onos-nofeature-ha
+Test Link: https://build.opnfv.org/ci/view/joid/job/joid-os-onos-nofeature-ha-baremetal-daily-colorado/
+Notes:
+
+Name:      joid-os-onos-sfc-ha
+Test Link: https://build.opnfv.org/ci/view/joid/job/joid-os-onos-sfc-ha-baremetal-daily-colorado/
+Notes:
+
+Name:      joid-os-nosdn-lxd-noha
+Test Link: https://build.opnfv.org/ci/user/narindergupta/my-views/view/joid/job/joid-os-nosdn-lxd-noha-baremetal-daily-colorado/
+Notes:
+
+Name:      joid-os-nosdn-nofeature-noha
+Test Link: https://build.opnfv.org/ci/user/narindergupta/my-views/view/joid/job/joid-os-nosdn-nofeature-noha-baremetal-daily-colorado/
+Notes:
 
 References
 ==========
-For more information on the OPNFV Brahmaputra release, please visit
-- `OPNFV Brahmaputra release <http://www.opnfv.org/brahmaputra>`_
+For more information on the OPNFV Colorado release, please visit
+- `OPNFV Colorado release <http://www.opnfv.org/colorado>`_
 
 Juju
 ----
@@ -185,11 +219,12 @@ JOID
 ----
 - `OPNFV JOID wiki <https://wiki.opnfv.org/joid>`_
 - `OPNFV JOID User Guide <https://wiki.opnfv.org/joid/b_userguide>`_
-- `OPNFV JOID Install Guide <https://wiki.opnfv.org/joid/b_installguide>`_
+- `OPNFV Release Notes <https://wiki.opnfv.org/display/joid/Colorado+Release+Notes>`_
+- `OPNFV JOID Install Guide <https://wiki.opnfv.org/display/joid/Colorado+installation+Guide>`_
 
 OpenStack
 ---------
-- `OpenStack Liberty Release artifacts <http://www.openstack.org/software/liberty>`_
+- `OpenStack Mitaka Release artifacts <http://www.openstack.org/software/mitaka>`_
 - `OpenStack documentation <http://docs.openstack.org>`_
 
 OpenDaylight