modified for JOID enablement.

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

2 files changed, 33 insertions, 33 deletions

diff --git a/docs/sources/artifacts-location.rst b/docs/sources/artifacts-location.rst
index 942bf06..8b674f0 100644
--- a/docs/sources/artifacts-location.rst
+++ b/docs/sources/artifacts-location.rst
@@ -20,7 +20,7 @@ VM manager components
 * OpenStack::
   location: `<http://docs.openstack.org/releases/releases/liberty.html>`_
   release: Liberty
-  
+
   joid_location: cloud-archive:liberty
   release: Liberty
 
@@ -28,8 +28,8 @@ Network controller components
 =============================
 
 * OpenDaylight Controller::
-  location: `https://nexus.opendaylight.org/content/groups/public/org/opendaylight/integration/distribution-karaf/0.3.3-Lithium-SR3/distribution-karaf-0.3.3-Lithium-SR3.tar.gz`
-  release: Lithium SR3
+  location: `https://nexus.opendaylight.org/content/repositories/staging/org/opendaylight/integration/distribution-karaf/0.4.0-Beryllium-RC2/distribution-karaf-0.4.0-Beryllium-RC2.tar.gz'
+  release: Beryllium RC2
 
 * OpenDaylight SFC::
   location: `<https://www.dropbox.com/s/6w76eo7loltvvb5/openstack.net-virt-sfc-karaf-1.2.1-SNAPSHOT.zip>`_
diff --git a/docs/sources/req-summary-support-matrix.rst b/docs/sources/req-summary-support-matrix.rst
index 0fdc16d..307b059 100644
--- a/docs/sources/req-summary-support-matrix.rst
+++ b/docs/sources/req-summary-support-matrix.rst
@@ -17,13 +17,13 @@ Target system requirements
 +==============================================+============+===========+============+============+
 | GENESIS-4  - Centos7 or Ubuntu 14.04         | yes        | yes       | yes        | yes        |
 +----------------------------------------------+------------+-----------+------------+------------+
-| GENESIS-53 - OpenStack Heat                  | yes        |           | yes        |            |
+| GENESIS-53 - OpenStack Heat                  | yes        |           | yes        | yes        |
 +----------------------------------------------+------------+-----------+------------+------------+
-| GENESIS-6  - OpenDaylight Beryllium          | yes        |           | yes        |            |
+| GENESIS-6  - OpenDaylight Beryllium          | yes        |           | yes        | yes        |
 +----------------------------------------------+------------+-----------+------------+------------+
-| GENESIS-49 - ONOSFW                          | yes        |           | yes        |            |
+| GENESIS-49 - ONOSFW                          | yes        |           | yes        | yes        |
 +----------------------------------------------+------------+-----------+------------+------------+
-| GENESIS-8  - KVM Hypervisor                  | yes        |           | yes        |            |
+| GENESIS-8  - KVM Hypervisor                  | yes        |           | yes        | yes        |
 +----------------------------------------------+------------+-----------+------------+------------+
 
 
@@ -33,56 +33,56 @@ User experience requirements
 +----------------------------------------------+------------+-----------+------------+------------+
 | Feature                                      | Apex       | Compass   | Fuel       | JOID/Juju  |
 +==============================================+============+===========+============+============+
-| GENESIS-9  - OpenStack HA                    | yes        |           | yes        |            |
+| GENESIS-9  - OpenStack HA                    | yes        |           | yes        | yes        |
 +----------------------------------------------+------------+-----------+------------+------------+
-| GENESIS-71 - Hitless hardware upgrade        | yes        |           | yes        |            |
+| GENESIS-71 - Hitless hardware upgrade        | yes        |           | yes        | yes        |
 +----------------------------------------------+------------+-----------+------------+------------+
-| GENESIS-20 - Server discovery integrated     | yes        |           | yes        |            |
+| GENESIS-20 - Server discovery integrated     | yes        |           | yes        | yes        |
 +----------------------------------------------+------------+-----------+------------+------------+
-| GENESIS-28 - Common configuration file       | yes        |           | yes        |            |
+| GENESIS-28 - Common configuration file       | yes        |           | yes        | yes        |
 +----------------------------------------------+------------+-----------+------------+------------+
-| GENESIS-43 - DHCP server HA per tenant       | yes        |           | yes        |            |
+| GENESIS-43 - DHCP server HA per tenant       | yes        |           | yes        | yes        |
 +----------------------------------------------+------------+-----------+------------+------------+
-| GENESIS-44 - SDN Controller L3               | yes        |           | yes        |            |
+| GENESIS-44 - SDN Controller L3               | yes        |           | yes        | no         |
 +----------------------------------------------+------------+-----------+------------+------------+
-| GENESIS-61 - L1/2 networking config          | yes        |           | yes        |            |
+| GENESIS-61 - L1/2 networking config          | yes        |           | yes        | yes        |
 +----------------------------------------------+------------+-----------+------------+------------+
-| GENESIS-62 - Logical networks                | yes        |           | yes        |            |
+| GENESIS-62 - Logical networks                | yes        |           | yes        | yes        |
 +----------------------------------------------+------------+-----------+------------+------------+
-| GENESIS-72 - L3-neutron agent                | yes        |           | yes        |            |
+| GENESIS-72 - L3-neutron agent                | yes        |           | yes        | yes        |
 +----------------------------------------------+------------+-----------+------------+------------+
-| GENESIS-69 - Isolated CEPH OSD               | yes        |           | yes        |            |
+| GENESIS-69 - Isolated CEPH OSD               | yes        |           | yes        | yes        |
 +----------------------------------------------+------------+-----------+------------+------------+
-| GENESIS-12 - Version control for components  | yes        |           | yes        |            |
+| GENESIS-12 - Version control for components  | yes        |           | yes        | yes        |
 +----------------------------------------------+------------+-----------+------------+------------+
-| GENESIS-16 - Common inventory config         | yes        |           | yes        |            |
+| GENESIS-16 - Common inventory config         | yes        |           | yes        | yes        |
 +----------------------------------------------+------------+-----------+------------+------------+
-| GENESIS-17 - User-facing config files        | yes        |           | yes        |            |
+| GENESIS-17 - User-facing config files        | yes        |           | yes        | yes        |
 +----------------------------------------------+------------+-----------+------------+------------+
-| GENESIS-18 - Server roles                    | yes        |           | yes        |            |
+| GENESIS-18 - Server roles                    | yes        |           | yes        | yes        |
 +----------------------------------------------+------------+-----------+------------+------------+
-| GENESIS-19 - Automatic device discovery      | yes        |           | yes        |            |
+| GENESIS-19 - Automatic device discovery      | yes        |           | yes        | yes        |
 +----------------------------------------------+------------+-----------+------------+------------+
-| GENESIS-25 - NTP config                      | yes        |           | yes        |            |
+| GENESIS-25 - NTP config                      | yes        |           | yes        | yes        |
 +----------------------------------------------+------------+-----------+------------+------------+
-| GENESIS-40 - Hardware replacement support    | yes        |           | yes        |            |
+| GENESIS-40 - Hardware replacement support    | yes        |           | yes        | yes        |
 +----------------------------------------------+------------+-----------+------------+------------+
-| GENESIS-74 - "all-in-one" build              | yes        |           | yes        |            |
+| GENESIS-74 - "all-in-one" build              | yes        |           | yes        | n/a        |
 +----------------------------------------------+------------+-----------+------------+------------+
-| GENESIS-31 - Agnostic to type of hard drive  | yes        |           | yes        |            |
+| GENESIS-31 - Agnostic to type of hard drive  | yes        |           | yes        | yes        |
 +----------------------------------------------+------------+-----------+------------+------------+
-| GENESIS-23 - Mandatory Access Control        | yes        |           | yes        |            |
+| GENESIS-23 - Mandatory Access Control        | yes        |           | yes        | yes        |
 +----------------------------------------------+------------+-----------+------------+------------+
-| GENESIS-24 - Install ssh keys                | yes        |           | yes        |            |
+| GENESIS-24 - Install ssh keys                | yes        |           | yes        | yes        |
 +----------------------------------------------+------------+-----------+------------+------------+
-| GENESIS-39 - Use artifacts from upstream     | yes        |           | yes        |            |
+| GENESIS-39 - Use artifacts from upstream     | yes        |           | yes        | yes        |
 +----------------------------------------------+------------+-----------+------------+------------+
-| GENESIS-38 - Deploy script for jumphost      | yes        |           | yes        |            |
+| GENESIS-38 - Deploy script for jumphost      | yes        |           | yes        | yes        |
 +----------------------------------------------+------------+-----------+------------+------------+
-| GENESIS-42 - Offline deployment              | yes        |           | yes        |            |
+| GENESIS-42 - Offline deployment              | yes        |           | yes        | yes        |
 +----------------------------------------------+------------+-----------+------------+------------+
-| GENESIS-34 - User guide                      | yes        |           | yes        |            |
+| GENESIS-34 - User guide                      | yes        |           | yes        | yes        |
 +----------------------------------------------+------------+-----------+------------+------------+
-| GENESIS-35 - Release notes                   | yes        |           | yes        |            |
+| GENESIS-35 - Release notes                   | yes        |           | yes        | yes        |
 +----------------------------------------------+------------+-----------+------------+------------+