Merge "[baremetal] reclass: Fix class order for common" into stable/euphrates

diff --git a/docs/release/release-notes/release-notes.rst b/docs/release/release-notes/release-notes.rst
index fd264e7..b20b4df 100644 (file)
--- a/docs/release/release-notes/release-notes.rst
+++ b/docs/release/release-notes/release-notes.rst
@@ -67,7 +67,7 @@ Release Data
 | **Release designation**              | Euphrates 5.0                        |
 |                                      |                                      |
 +--------------------------------------+--------------------------------------+
-| **Release date**                     | October 6 2017                       |
+| **Release date**                     | October 20 2017                      |
 |                                      |                                      |
 +--------------------------------------+--------------------------------------+
 | **Purpose of the delivery**          | Euphrates alignment to Released      |

diff --git a/docs/release/scenarios/os-nosdn-ovs-ha/index.rst b/docs/release/scenarios/os-nosdn-ovs-ha/index.rst
new file mode 100644 (file)
index 0000000..e0fcc7e
--- /dev/null
+++ b/docs/release/scenarios/os-nosdn-ovs-ha/index.rst
@@ -0,0 +1,16 @@
+.. _os-nosdn-ovs-ha:
+
+.. This work is licensed under a Creative Commons Attribution 4.0 International Licence.
+.. http://creativecommons.org/licenses/by/4.0
+.. (c) 2017 Mirantis Inc., Enea Software AB and others
+
+========================================
+os-nosdn-ovs-ha overview and description
+========================================
+
+.. toctree::
+   :numbered:
+   :maxdepth: 2
+
+   os-nosdn-ovs-ha.rst
+

diff --git a/docs/release/scenarios/os-nosdn-ovs-ha/os-nosdn-ovs-ha.rst b/docs/release/scenarios/os-nosdn-ovs-ha/os-nosdn-ovs-ha.rst
new file mode 100644 (file)
index 0000000..5e30ab5
--- /dev/null
+++ b/docs/release/scenarios/os-nosdn-ovs-ha/os-nosdn-ovs-ha.rst
@@ -0,0 +1,42 @@
+.. This work is licensed under a Creative Commons Attribution 4.0 International License.
+.. http://creativecommons.org/licenses/by/4.0
+.. (c)2017 Mirantis Inc., Enea Software AB and others
+
+This document provides scenario level details for Euphrates 5.0 of
+deployment with no SDN controller and no extra features enabled.
+
+============
+Introduction
+============
+
+This scenario is used primarily to validate and deploy a Ocata OpenStack
+deployment without any NFV features or SDN controller enabled.
+
+Scenario components and composition
+===================================
+
+This scenario is composed of common OpenStack services enabled by default,
+including Nova, Neutron, Glance, Cinder, Keystone, Horizon. It also installs
+the DPDK-enabled Open vSwitch component.
+
+All services are in HA, meaning that there are multiple cloned instances of
+each service, and they are balanced by HA Proxy using a Virtual IP Address
+per service.
+
+
+Scenario usage overview
+=======================
+
+Simply deploy this scenario by using the os-nosdn-ovs-ha.yaml deploy
+settings file.
+
+Limitations, Issues and Workarounds
+===================================
+
+None
+
+References
+==========
+
+For more information on the OPNFV Euphrates release, please visit
+http://www.opnfv.org/euphrates

diff --git a/docs/release/scenarios/os-nosdn-ovs-noha/index.rst b/docs/release/scenarios/os-nosdn-ovs-noha/index.rst
new file mode 100644 (file)
index 0000000..de9b657
--- /dev/null
+++ b/docs/release/scenarios/os-nosdn-ovs-noha/index.rst
@@ -0,0 +1,16 @@
+.. _os-nosdn-ovs-noha:
+
+.. This work is licensed under a Creative Commons Attribution 4.0 International Licence.
+.. http://creativecommons.org/licenses/by/4.0
+.. (c) 2017 Mirantis Inc., Enea Software AB and others
+
+==========================================
+os-nosdn-ovs-noha overview and description
+==========================================
+
+.. toctree::
+   :numbered:
+   :maxdepth: 2
+
+   os-nosdn-ovs-noha.rst
+

diff --git a/docs/release/scenarios/os-nosdn-ovs-noha/os-nosdn-ovs-noha.rst b/docs/release/scenarios/os-nosdn-ovs-noha/os-nosdn-ovs-noha.rst
new file mode 100644 (file)
index 0000000..7ac4e11
--- /dev/null
+++ b/docs/release/scenarios/os-nosdn-ovs-noha/os-nosdn-ovs-noha.rst
@@ -0,0 +1,41 @@
+.. This work is licensed under a Creative Commons Attribution 4.0 International License.
+.. http://creativecommons.org/licenses/by/4.0
+.. (c) 2017 Mirantis Inc., Enea Software AB and others
+
+This document provides scenario level details for Euphrates 5.0 of
+deployment with no SDN controller and no extra features enabled.
+
+============
+Introduction
+============
+
+This scenario is used primarily to validate and deploy a Ocata OpenStack
+deployment without any NFV features or SDN controller enabled.
+
+
+Scenario components and composition
+===================================
+
+This scenario is composed of common OpenStack services enabled by default,
+including Nova, Neutron, Glance, Cinder, Keystone, Horizon. It also installs
+the DPDK-enabled Open vSwitch component.
+
+
+Scenario usage overview
+=======================
+
+Simply deploy this scenario by using the os-nosdn-ovs-ha.yaml deploy
+settings file.
+
+
+Limitations, Issues and Workarounds
+===================================
+
+Tested on virtual deploy only.
+
+References
+==========
+
+For more information on the OPNFV Euphrates release, please visit
+http://www.opnfv.org/euphrates
+