Merge "Remove downloading undercloud.qcow2"

[apex.git] / docs / release / installation / architecture.rst

diff --git a/docs/release/installation/architecture.rst b/docs/release/installation/architecture.rst
index eff5d35..0bf2d3b 100644 (file)
--- a/docs/release/installation/architecture.rst
+++ b/docs/release/installation/architecture.rst
@@ -16,8 +16,7 @@ deploy the overcloud.
 
 The undercloud is the all-in-one installation of OpenStack that includes
 baremetal provisioning capability.  The undercloud will be deployed as a
-virtual machine on a jumphost.  This VM is pre-built and distributed as part
-of the Apex RPM.
+virtual machine on a Jump Host.
 
 The overcloud is OPNFV. Configuration will be passed into undercloud and
 the undercloud will use OpenStack's orchestration component, named Heat, to
@@ -116,7 +115,7 @@ the installer as a (-d) deploy setting.  Read further in the Apex documentation
 to learn more about invoking the deploy command.  Below is quick reference
 matrix for OPNFV scenarios supported in Apex.  Please refer to the respective
 OPNFV Docs documentation for each scenario in order to see a full scenario
-description.  Also, please refer to release-notes for information about known
+description.  Also, please refer to release notes for information about known
 issues per scenario.  The following scenarios correspond to a supported
 <Scenario>.yaml deploy settings file:
 
@@ -127,49 +126,68 @@ issues per scenario.  The following scenarios correspond to a supported
 +-------------------------+-------------+---------------+
 | os-nosdn-nofeature-noha | Apex        | Yes           |
 +-------------------------+-------------+---------------+
-| os-nosdn-ovs-ha         | OVS for NFV | Yes           |
+| os-nosdn-bar-ha         | Barometer   | No            |
 +-------------------------+-------------+---------------+
-| os-nosdn-ovs-noha       | OVS for NFV | Yes           |
+| os-nosdn-bar-noha       | Barometer   | No            |
++-------------------------+-------------+---------------+
+| os-nosdn-calipso-noha   | Calipso     | Yes           |
++-------------------------+-------------+---------------+
+| os-nosdn-ovs_dpdk-ha    | Apex        | No            |
++-------------------------+-------------+---------------+
+| os-nosdn-ovs_dpdk-noha  | Apex        | No            |
 +-------------------------+-------------+---------------+
 | os-nosdn-fdio-ha        | FDS         | No            |
 +-------------------------+-------------+---------------+
 | os-nosdn-fdio-noha      | FDS         | No            |
 +-------------------------+-------------+---------------+
-| os-nosdn-kvm-ha         | KVM for NFV | Yes           |
+| os-nosdn-kvm_ovs_dpdk-ha| KVM for NFV | No            |
 +-------------------------+-------------+---------------+
-| os-nosdn-kvm-noha       | KVM for NFV | Yes           |
+| os-nosdn-kvm_ovs_dpdk   | KVM for NFV | No            |
+| -noha                   |             |               |
 +-------------------------+-------------+---------------+
-| os-nosdn-performance-ha | Apex        | Yes           |
+| os-nosdn-performance-ha | Apex        | No            |
 +-------------------------+-------------+---------------+
-| os-odl_l3-nofeature-ha  | Apex        | Yes           |
+| os-odl-nofeature-ha     | Apex        | Yes           |
 +-------------------------+-------------+---------------+
-| os-odl_l3-nofeature-noha| Apex        | Yes           |
+| os-odl-nofeature-noha   | Apex        | Yes           |
 +-------------------------+-------------+---------------+
-| os-odl_l3-ovs-ha        | OVS for NFV | Yes           |
+| os-odl-ovs_dpdk-ha      | Apex        | No            |
 +-------------------------+-------------+---------------+
-| os-odl_l3-ovs-noha      | OVS for NFV | Yes           |
+| os-odl-ovs_dpdk-noha    | Apex        | No            |
 +-------------------------+-------------+---------------+
 | os-odl-bgpvpn-ha        | SDNVPN      | Yes           |
 +-------------------------+-------------+---------------+
 | os-odl-bgpvpn-noha      | SDNVPN      | Yes           |
 +-------------------------+-------------+---------------+
-| os-odl-gluon-noha       | GluOn       | Yes           |
+| os-odl-sriov-ha         | Apex        | No            |
++-------------------------+-------------+---------------+
+| os-odl-sriov-noha       | Apex        | No            |
++-------------------------+-------------+---------------+
+| os-odl-l2gw-ha          | Apex        | No            |
 +-------------------------+-------------+---------------+
-| os-odl_l3-csit-noha     | Apex        | Yes           |
+| os-odl-l2gw-noha        | Apex        | No            |
 +-------------------------+-------------+---------------+
-| os-odl_l3-fdio-ha       | FDS         | Yes           |
+| os-odl-sfc-ha           | SFC         | Yes           |
 +-------------------------+-------------+---------------+
-| os-odl_l3-fdio-noha     | FDS         | Yes           |
+| os-odl-sfc-noha         | SFC         | Yes           |
 +-------------------------+-------------+---------------+
-| os-odl_l2-fdio-ha       | FDS         | Yes           |
+| os-odl-gluon-noha       | Gluon       | No            |
 +-------------------------+-------------+---------------+
-| os-odl_l2-fdio-noha     | FDS         | Yes           |
+| os-odl-csit-noha        | Apex        | No            |
 +-------------------------+-------------+---------------+
-| os-odl_l2-sfc-noha      | SFC         | No            |
+| os-odl-fdio-ha          | FDS         | No            |
++-------------------------+-------------+---------------+
+| os-odl-fdio-noha        | FDS         | No            |
++-------------------------+-------------+---------------+
+| os-odl-fdio_dvr-ha      | FDS         | No            |
++-------------------------+-------------+---------------+
+| os-odl-fdio_dvr-noha    | FDS         | No            |
 +-------------------------+-------------+---------------+
 | os-onos-nofeature-ha    | ONOSFW      | No            |
 +-------------------------+-------------+---------------+
 | os-onos-sfc-ha          | ONOSFW      | No            |
 +-------------------------+-------------+---------------+
-| os-ovn-nofeature-noha   | Apex        | Yes           |
+| os-ovn-nofeature-noha   | Apex        | No            |
++-------------------------+-------------+---------------+
+| os-ovn-nofeature-ha     | Apex        | Yes           |
 +-------------------------+-------------+---------------+