aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--docs/release/installation/installation.instruction.rst30
-rw-r--r--docs/release/release-notes/release-notes.rst81
-rw-r--r--docs/release/scenarios/index.rst12
-rw-r--r--docs/release/scenarios/os-nosdn-nofeature-ha/index.rst14
-rw-r--r--docs/release/scenarios/os-nosdn-nofeature-ha/os-nosdn-nofeature-ha.rst40
-rw-r--r--docs/release/scenarios/os-nosdn-nofeature-noha/index.rst14
-rw-r--r--docs/release/scenarios/os-nosdn-nofeature-noha/os-nosdn-nofeature-noha.rst38
-rw-r--r--docs/release/scenarios/os-odl-nofeature-ha/index.rst14
-rw-r--r--docs/release/scenarios/os-odl-nofeature-ha/os-odl-nofeature-ha.rst40
-rw-r--r--docs/release/scenarios/os-odl-nofeature-noha/index.rst14
-rw-r--r--docs/release/scenarios/os-odl-nofeature-noha/os-odl-nofeature-noha.rst39
-rw-r--r--docs/release/userguide/userguide.rst2
-rw-r--r--mcp/patches/salt-formula-maas/0006-curtin-Add-Bionic-support.patch20
-rw-r--r--mcp/reclass/classes/cluster/all-mcp-arch-common/infra/maas.yml.j23
-rw-r--r--mcp/reclass/classes/cluster/mcp-common-ha/infra/kvm.yml.j21
-rw-r--r--mcp/reclass/classes/cluster/mcp-common-ha/openstack_compute.yml1
-rw-r--r--mcp/reclass/classes/cluster/mcp-fdio-noha/openstack/compute.yml.j21
-rw-r--r--mcp/reclass/classes/cluster/mcp-fdio-noha/openstack/gateway.yml1
-rw-r--r--mcp/reclass/classes/cluster/mcp-iec-noha/infra/kvm.yml.j21
19 files changed, 275 insertions, 91 deletions
diff --git a/docs/release/installation/installation.instruction.rst b/docs/release/installation/installation.instruction.rst
index bdb52d8df..8c013dd65 100644
--- a/docs/release/installation/installation.instruction.rst
+++ b/docs/release/installation/installation.instruction.rst
@@ -9,7 +9,7 @@ OPNFV Fuel Installation Instruction
Abstract
========
-This document describes how to install the ``Hunter`` release of
+This document describes how to install the ``Iruya`` release of
OPNFV when using Fuel as a deployment tool, covering its usage,
limitations, dependencies and required system resources.
@@ -21,20 +21,20 @@ Introduction
============
This document provides guidelines on how to install and
-configure the ``Hunter`` release of OPNFV when using Fuel as a
+configure the ``Iruya`` release of OPNFV when using Fuel as a
deployment tool, including required software and hardware configurations.
Although the available installation options provide a high degree of
freedom in how the system is set up, including architecture, services
and features, etc., said permutations may not provide an OPNFV
compliant reference architecture. This document provides a
-step-by-step guide that results in an OPNFV ``Hunter`` compliant
+step-by-step guide that results in an OPNFV ``Iruya`` compliant
deployment.
The audience of this document is assumed to have good knowledge of
networking and Unix/Linux administration.
-Before starting the installation of the ``Hunter`` release of
+Before starting the installation of the ``Iruya`` release of
OPNFV, using Fuel as a deployment tool, some planning must be
done.
@@ -80,7 +80,7 @@ Hardware Requirements for ``virtual`` Deploys
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
The following minimum hardware requirements must be met for the ``virtual``
-installation of ``Hunter`` using Fuel:
+installation of ``Iruya`` using Fuel:
+------------------+------------------------------------------------------+
| **HW Aspect** | **Requirement** |
@@ -101,7 +101,7 @@ Hardware Requirements for ``baremetal`` Deploys
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
The following minimum hardware requirements must be met for the ``baremetal``
-installation of ``Hunter`` using Fuel:
+installation of ``Iruya`` using Fuel:
+------------------+------------------------------------------------------+
| **HW Aspect** | **Requirement** |
@@ -163,7 +163,7 @@ Hardware Requirements for ``hybrid`` (``baremetal`` + ``virtual``) Deploys
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
The following minimum hardware requirements must be met for the ``hybrid``
-installation of ``Hunter`` using Fuel:
+installation of ``Iruya`` using Fuel:
+------------------+------------------------------------------------------+
| **HW Aspect** | **Requirement** |
@@ -255,7 +255,7 @@ three physically separated networks.
infrastructure as well as the provider networks and the private tenant
VLANs needs to be manually configured.
-Manual configuration of the ``Hunter`` hardware platform should
+Manual configuration of the ``Iruya`` hardware platform should
be carried out according to the `OPNFV Pharos Specification`_.
OPNFV Software Prerequisites
@@ -864,7 +864,7 @@ Sample ``compute_params`` configuration block (for a single node):
``SDF``
~~~~~~~
-Scenario Descriptor Files are not yet implemented in the OPNFV Fuel ``Hunter``
+Scenario Descriptor Files are not yet implemented in the OPNFV Fuel ``Iruya``
release.
Instead, embedded OPNFV Fuel scenarios files are locally available in
@@ -881,7 +881,7 @@ Deployment Types
.. WARNING::
- OPNFV releases previous to ``Hunter`` used to rely on the ``virtual``
+ OPNFV releases previous to ``Iruya`` used to rely on the ``virtual``
keyword being part of the POD name (e.g. ``ericsson-virtual2``) to
configure the deployment type as ``virtual``. Otherwise ``baremetal``
was implied.
@@ -951,7 +951,7 @@ These steps are common for ``virtual``, ``baremetal`` or ``hybrid`` deploys,
``x86_64``, ``aarch64`` or ``mixed`` (``x86_64`` and ``aarch64``):
- Clone the OPNFV Fuel code from gerrit
-- Checkout the ``Hunter`` release tag
+- Checkout the ``Iruya`` release tag
- Start the deploy script
.. NOTE::
@@ -971,7 +971,7 @@ These steps are common for ``virtual``, ``baremetal`` or ``hybrid`` deploys,
jenkins@jumpserver:~$ git clone https://git.opnfv.org/fuel
jenkins@jumpserver:~$ cd fuel
- jenkins@jumpserver:~/fuel$ git checkout opnfv-8.1.0
+ jenkins@jumpserver:~/fuel$ git checkout opnfv-9.0.0
jenkins@jumpserver:~/fuel$ ci/deploy.sh -l <lab_name> \
-p <pod_name> \
-b <URI to configuration repo containing the PDF/IDF files> \
@@ -1377,12 +1377,12 @@ article.
References
==========
-For more information on the OPNFV ``Hunter`` 8.1 release, please see:
+For more information on the OPNFV ``Iruya`` 9.0 release, please see:
#. `OPNFV Home Page`_
#. `OPNFV Documentation`_
#. `OPNFV Software Downloads`_
-#. `OPNFV Hunter Wiki Page`_
+#. `OPNFV Iruya Wiki Page`_
#. `OpenStack Rocky Release Artifacts`_
#. `OpenStack Documentation`_
#. `OpenDaylight Artifacts`_
@@ -1401,7 +1401,7 @@ For more information on the OPNFV ``Hunter`` 8.1 release, please see:
.. _`OpenStack Documentation`: https://docs.openstack.org/rocky
.. _`OpenStack Rocky Release Artifacts`: https://www.openstack.org/software/rocky
.. _`OPNFV Home Page`: https://www.opnfv.org
-.. _`OPNFV Hunter Wiki Page`: https://wiki.opnfv.org/display/SWREL/Hunter
+.. _`OPNFV Iruya Wiki Page`: https://wiki.opnfv.org/display/SWREL/Iruya
.. _`OPNFV Documentation`: https://docs.opnfv.org
.. _`OPNFV Software Downloads`: https://www.opnfv.org/software/downloads
.. _`Apache License 2.0`: https://www.apache.org/licenses/LICENSE-2.0
diff --git a/docs/release/release-notes/release-notes.rst b/docs/release/release-notes/release-notes.rst
index 5d0387af9..846200faa 100644
--- a/docs/release/release-notes/release-notes.rst
+++ b/docs/release/release-notes/release-notes.rst
@@ -9,7 +9,7 @@ OPNFV Fuel Release Notes
Abstract
========
-This document provides the release notes for ``Hunter`` release with the Fuel
+This document provides the release notes for ``Iruya`` release with the Fuel
deployment toolchain.
Starting with ``Gambia`` release, both ``x86_64`` and ``aarch64`` architectures
@@ -23,13 +23,13 @@ All Fuel and "common" entities are protected by the `Apache License 2.0`_.
Important Notes
===============
-This is the OPNFV ``Hunter`` release that implements the deploy stage of the
+This is the OPNFV ``Iruya`` release that implements the deploy stage of the
OPNFV CI pipeline via Fuel.
Fuel is based on the `MCP`_ installation tool chain.
More information available at `Mirantis Cloud Platform Documentation`_.
-The goal of the ``Hunter`` release and this Fuel-based deployment process is
+The goal of the ``Iruya`` release and this Fuel-based deployment process is
to establish a lab ready platform accelerating further development
of the OPNFV infrastructure.
@@ -38,7 +38,7 @@ Carefully follow the installation instructions.
Summary
=======
-``Hunter`` release with the Fuel deployment toolchain will establish an OPNFV
+``Iruya`` release with the Fuel deployment toolchain will establish an OPNFV
target system on a Pharos compliant lab infrastructure. The current definition
of an OPNFV target system is OpenStack Queens combined with an SDN
controller, such as OpenDaylight. The system is deployed with OpenStack High
@@ -53,23 +53,21 @@ Furthermore, Fuel is capable of deploying scenarios in a ``baremetal``,
``virtual`` or ``hybrid`` fashion. ``virtual`` deployments use multiple VMs on
the Jump Host and internal networking to simulate the ``baremetal`` deployment.
-For ``Hunter``, the typical use of Fuel as an OpenStack installer is
+For ``Iruya``, the typical use of Fuel as an OpenStack installer is
supplemented with OPNFV unique components such as:
- `OpenDaylight`_
-- Open Virtual Network (``OVN``)
-- `Vector Packet Processing`_
As well as OPNFV-unique configurations of the Hardware and Software stack.
-This ``Hunter`` artifact provides Fuel as the deployment stage tool in the
+This ``Iruya`` artifact provides Fuel as the deployment stage tool in the
OPNFV CI pipeline including:
- Automated (Jenkins, RTD) documentation build & publish (multiple documents);
- Automated (Jenkins) build & publish of Salt Master Docker image;
-- Automated (Jenkins) deployment of ``Hunter`` running on baremetal or a nested
+- Automated (Jenkins) deployment of ``Iruya`` running on baremetal or a nested
hypervisor environment (KVM);
-- Automated (Jenkins) validation of the ``Hunter`` deployment
+- Automated (Jenkins) validation of the ``Iruya`` deployment
Release Data
============
@@ -78,16 +76,16 @@ Release Data
| **Project** | fuel |
| | |
+--------------------------------------+--------------------------------------+
-| **Repo/tag** | opnfv-8.1.0 |
+| **Repo/tag** | opnfv-9.0.0 |
| | |
+--------------------------------------+--------------------------------------+
-| **Release designation** | Hunter 8.1 |
+| **Release designation** | Iruya 9.0 |
| | |
+--------------------------------------+--------------------------------------+
-| **Release date** | June 24, 2019 |
+| **Release date** | January 31, 2020 |
| | |
+--------------------------------------+--------------------------------------+
-| **Purpose of the delivery** | OPNFV Hunter 8.1 release |
+| **Purpose of the delivery** | OPNFV Iruya 9.0 release |
+--------------------------------------+--------------------------------------+
Version Change
@@ -96,21 +94,21 @@ Version Change
Module Version Changes
~~~~~~~~~~~~~~~~~~~~~~
-This is the first tracked version of the ``Hunter`` release with the Fuel
+This is the first tracked version of the ``Iruya`` release with the Fuel
deployment toolchain. It is based on following upstream versions:
- MCP (``Q1`19`` GA release)
-- OpenStack (``Rocky`` release)
+- OpenStack (``Stein`` release)
-- OpenDaylight (``Fluorine`` release)
+- OpenDaylight (``Neon`` release)
-- Ubuntu (``16.04`` release)
+- Ubuntu (``18.04`` release)
Document Changes
~~~~~~~~~~~~~~~~
-This is the ``Hunter`` 8.1 release.
+This is the ``Iruya`` 9.0 release.
It comes with the following documentation:
- :ref:`OPNFV Fuel Installation Instruction <fuel-installation>`
@@ -125,20 +123,12 @@ Reason for Version
Feature Additions
~~~~~~~~~~~~~~~~~
-- ``multiarch`` cluster support;
-- ``hybrid`` cluster support;
-- ``PDF``/``IDF`` support for ``virtual`` PODs;
-- ``baremetal`` support for noHA deployments;
-- containerized Salt Master;
-- ``OVN`` scenarios;
-- ``ODL`` ``BGPVPN`` scenario;
-- ``IDF`` support for configuring cluster-level ``MTU``;
+Due to reduced schedule, this is a maintainance release.
Bug Corrections
~~~~~~~~~~~~~~~
-For an exhaustive list, see the `OPNFV Fuel JIRA: Hunter 8.1 Bugs (fixed)`_
-filter.
+N/A
Software Deliverables
~~~~~~~~~~~~~~~~~~~~~
@@ -166,30 +156,9 @@ Scenario Matrix
| os-nosdn-nofeature-ha | ``x86_64``, | | |
| | ``aarch64`` | | |
+-------------------------+---------------+-------------+------------+
-| os-nosdn-ovs-noha | | ``x86_64`` | |
-+-------------------------+---------------+-------------+------------+
-| os-nosdn-ovs-ha | ``x86_64``, | | |
-| | ``aarch64`` | | |
-+-------------------------+---------------+-------------+------------+
| os-odl-nofeature-noha | | ``x86_64`` | |
+-------------------------+---------------+-------------+------------+
| os-odl-nofeature-ha | ``x86_64``, | | |
-| | ``aarch64`` | | |
-+-------------------------+---------------+-------------+------------+
-| os-odl-ovs-noha | | ``x86_64`` | |
-+-------------------------+---------------+-------------+------------+
-| os-odl-ovs-ha | ``x86_64`` | | |
-+-------------------------+---------------+-------------+------------+
-| os-odl-bgpvpn-noha | | ``x86_64`` | |
-+-------------------------+---------------+-------------+------------+
-| os-odl-sfc-noha | | ``x86_64`` | |
-+-------------------------+---------------+-------------+------------+
-| os-ovn-nofeature-noha | | ``x86_64`` | |
-+-------------------------+---------------+-------------+------------+
-| os-ovn-nofeature-ha | ``aarch64`` | | |
-+-------------------------+---------------+-------------+------------+
-| os-nosdn-fdio-noha | ``x86_64``, | | |
-| | ``aarch64`` | | |
+-------------------------+---------------+-------------+------------+
Known Limitations, Issues and Workarounds
@@ -220,18 +189,18 @@ None
Test Results
============
-The ``Hunter`` 8.1 release with the Fuel deployment tool has undergone QA test
+The ``Iruya`` 9.0 release with the Fuel deployment tool has undergone QA test
runs, see separate test results.
References
==========
-For more information on the OPNFV ``Hunter`` 8.1 release, please see:
+For more information on the OPNFV ``Iruya`` 9.0 release, please see:
#. `OPNFV Home Page`_
#. `OPNFV Documentation`_
#. `OPNFV Software Downloads`_
-#. `OPNFV Hunter Wiki Page`_
+#. `OPNFV Iruya Wiki Page`_
#. `OpenStack Queens Release Artifacts`_
#. `OpenStack Documentation`_
#. `OpenDaylight Artifacts`_
@@ -245,11 +214,9 @@ For more information on the OPNFV ``Hunter`` 8.1 release, please see:
.. _`Mirantis Cloud Platform Documentation`: https://docs.mirantis.com/mcp/latest/
.. _`fuel git repository`: https://git.opnfv.org/fuel
.. _`OpenStack Documentation`: https://docs.openstack.org/rocky
-.. _`OpenStack Rocky Release Artifacts`: https://www.openstack.org/software/rocky
+.. _`OpenStack Stein Release Artifacts`: https://www.openstack.org/software/stein
.. _`OPNFV Home Page`: https://www.opnfv.org
-.. _`OPNFV Hunter Wiki Page`: https://wiki.opnfv.org/display/SWREL/Hunter
+.. _`OPNFV Iruya Wiki Page`: https://wiki.opnfv.org/display/SWREL/Iruya
.. _`OPNFV Documentation`: https://docs.opnfv.org
.. _`OPNFV Software Downloads`: https://www.opnfv.org/software/downloads
.. _`Apache License 2.0`: https://www.apache.org/licenses/LICENSE-2.0
-.. OPNFV Fuel Hunter JIRA filters
-.. _`OPNFV Fuel JIRA: Hunter 8.1 Bugs (fixed)`: https://jira.opnfv.org/issues/?filter=12710
diff --git a/docs/release/scenarios/index.rst b/docs/release/scenarios/index.rst
index c61c6b791..651e0fdd4 100644
--- a/docs/release/scenarios/index.rst
+++ b/docs/release/scenarios/index.rst
@@ -11,11 +11,7 @@ OPNFV Fuel Scenarios
.. toctree::
:maxdepth: 2
- os-nosdn-ovs-noha/index.rst
- os-nosdn-ovs-ha/index.rst
- os-ovn-nofeature-noha/index.rst
- os-ovn-nofeature-ha/index.rst
- os-nosdn-fdio-noha/index.rst
- os-odl-ovs-noha/index.rst
- os-nosdn-onap-ha/index.rst
- os-nosdn-onap-noha/index.rst
+ os-nosdn-nofeature-noha/index.rst
+ os-nosdn-nofeature-ha/index.rst
+ os-odl-nofeature-noha/index.rst
+ os-odl-nofeature-ha/index.rst
diff --git a/docs/release/scenarios/os-nosdn-nofeature-ha/index.rst b/docs/release/scenarios/os-nosdn-nofeature-ha/index.rst
new file mode 100644
index 000000000..88e6c8336
--- /dev/null
+++ b/docs/release/scenarios/os-nosdn-nofeature-ha/index.rst
@@ -0,0 +1,14 @@
+.. _os-nosdn-nofeature-ha:
+
+.. This work is licensed under a Creative Commons Attribution 4.0 International Licence.
+.. http://creativecommons.org/licenses/by/4.0
+.. (c) 2018 Mirantis Inc., Enea Software AB and others
+
+==============================================
+os-nosdn-nofeature-ha overview and description
+==============================================
+
+.. toctree::
+ :maxdepth: 2
+
+.. include:: os-nosdn-nofeature-ha.rst
diff --git a/docs/release/scenarios/os-nosdn-nofeature-ha/os-nosdn-nofeature-ha.rst b/docs/release/scenarios/os-nosdn-nofeature-ha/os-nosdn-nofeature-ha.rst
new file mode 100644
index 000000000..6a793702c
--- /dev/null
+++ b/docs/release/scenarios/os-nosdn-nofeature-ha/os-nosdn-nofeature-ha.rst
@@ -0,0 +1,40 @@
+.. This work is licensed under a Creative Commons Attribution 4.0 International License.
+.. http://creativecommons.org/licenses/by/4.0
+.. (c) 2018 Mirantis Inc., Enea Software AB and others
+
+This document provides scenario level details for Iruya 9.0 of
+deployment with no SDN controller and no extra features enabled.
+
+Introduction
+============
+
+This scenario is used primarily to validate and deploy a Stein 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.
+
+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 setting os-nosdn-nofeature-ha as scenario
+deploy parameter.
+
+Limitations, Issues and Workarounds
+===================================
+
+None
+
+References
+==========
+
+For more information on the OPNFV Iruya release, please visit
+https://www.opnfv.org/software
diff --git a/docs/release/scenarios/os-nosdn-nofeature-noha/index.rst b/docs/release/scenarios/os-nosdn-nofeature-noha/index.rst
new file mode 100644
index 000000000..8243b74eb
--- /dev/null
+++ b/docs/release/scenarios/os-nosdn-nofeature-noha/index.rst
@@ -0,0 +1,14 @@
+.. _os-nosdn-nofeature-noha:
+
+.. This work is licensed under a Creative Commons Attribution 4.0 International Licence.
+.. http://creativecommons.org/licenses/by/4.0
+.. (c) 2018 Mirantis Inc., Enea Software AB and others
+
+================================================
+os-nosdn-nofeature-noha overview and description
+================================================
+
+.. toctree::
+ :maxdepth: 2
+
+.. include:: os-nosdn-nofeature-noha.rst
diff --git a/docs/release/scenarios/os-nosdn-nofeature-noha/os-nosdn-nofeature-noha.rst b/docs/release/scenarios/os-nosdn-nofeature-noha/os-nosdn-nofeature-noha.rst
new file mode 100644
index 000000000..b66e8500b
--- /dev/null
+++ b/docs/release/scenarios/os-nosdn-nofeature-noha/os-nosdn-nofeature-noha.rst
@@ -0,0 +1,38 @@
+.. This work is licensed under a Creative Commons Attribution 4.0 International License.
+.. http://creativecommons.org/licenses/by/4.0
+.. (c) 2018 Mirantis Inc., Enea Software AB and others
+
+This document provides scenario level details for Iruya 9.0 of
+deployment with no SDN controller and no extra features enabled.
+
+Introduction
+============
+
+This scenario is used primarily to validate and deploy a Stein 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.
+
+
+Scenario usage overview
+=======================
+
+Simply deploy this scenario by setting os-nosdn-nofeature-noha as scenario
+deploy parameter.
+
+
+Limitations, Issues and Workarounds
+===================================
+
+Tested on virtual deploy only.
+
+References
+==========
+
+For more information on the OPNFV Iruya release, please visit
+https://www.opnfv.org/software
diff --git a/docs/release/scenarios/os-odl-nofeature-ha/index.rst b/docs/release/scenarios/os-odl-nofeature-ha/index.rst
new file mode 100644
index 000000000..998671cbd
--- /dev/null
+++ b/docs/release/scenarios/os-odl-nofeature-ha/index.rst
@@ -0,0 +1,14 @@
+.. _os-odl-nofeature-ha:
+
+.. This work is licensed under a Creative Commons Attribution 4.0 International Licence.
+.. http://creativecommons.org/licenses/by/4.0
+.. (c) 2018 Mirantis Inc., Enea Software AB and others
+
+============================================
+os-odl-nofeature-ha overview and description
+============================================
+
+.. toctree::
+ :maxdepth: 2
+
+.. include:: os-odl-nofeature-ha.rst
diff --git a/docs/release/scenarios/os-odl-nofeature-ha/os-odl-nofeature-ha.rst b/docs/release/scenarios/os-odl-nofeature-ha/os-odl-nofeature-ha.rst
new file mode 100644
index 000000000..e5d942ab5
--- /dev/null
+++ b/docs/release/scenarios/os-odl-nofeature-ha/os-odl-nofeature-ha.rst
@@ -0,0 +1,40 @@
+.. This work is licensed under a Creative Commons Attribution 4.0 International License.
+.. http://creativecommons.org/licenses/by/4.0
+.. (c) 2018 Mirantis Inc., Enea Software AB and others
+
+This document provides scenario level details for Iruya 9.0 of
+deployment with OpenDaylight controller.
+
+Introduction
+============
+
+This scenario is used primarily to validate and deploy a Stein OpenStack
+deployment with OpenDaylight Neon controller enabled.
+
+
+Scenario components and composition
+===================================
+
+This scenario is composed of common OpenStack services enabled by default,
+including Nova, Neutron, Glance, Cinder, Keystone, Horizon. 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.
+OpenDaylight is installed as a SDN controller on one of the controller nodes.
+
+Scenario usage overview
+=======================
+
+Simply deploy this scenario by setting os-odl-nofeature-noha as scenario
+deploy parameter.
+
+
+Limitations, Issues and Workarounds
+===================================
+
+None
+
+References
+==========
+
+For more information on the OPNFV Iruya release, please visit
+https://www.opnfv.org/software
diff --git a/docs/release/scenarios/os-odl-nofeature-noha/index.rst b/docs/release/scenarios/os-odl-nofeature-noha/index.rst
new file mode 100644
index 000000000..bbe12cc52
--- /dev/null
+++ b/docs/release/scenarios/os-odl-nofeature-noha/index.rst
@@ -0,0 +1,14 @@
+.. _os-odl-nofeature-noha:
+
+.. This work is licensed under a Creative Commons Attribution 4.0 International Licence.
+.. http://creativecommons.org/licenses/by/4.0
+.. (c) 2018 Mirantis Inc., Enea Software AB and others
+
+==============================================
+os-odl-nofeature-noha overview and description
+==============================================
+
+.. toctree::
+ :maxdepth: 2
+
+.. include:: os-odl-nofeature-noha.rst
diff --git a/docs/release/scenarios/os-odl-nofeature-noha/os-odl-nofeature-noha.rst b/docs/release/scenarios/os-odl-nofeature-noha/os-odl-nofeature-noha.rst
new file mode 100644
index 000000000..f9140b240
--- /dev/null
+++ b/docs/release/scenarios/os-odl-nofeature-noha/os-odl-nofeature-noha.rst
@@ -0,0 +1,39 @@
+.. This work is licensed under a Creative Commons Attribution 4.0 International License.
+.. http://creativecommons.org/licenses/by/4.0
+.. (c) 2018 Mirantis Inc., Enea Software AB and others
+
+This document provides scenario level details for Iruya 9.0 of
+deployment with OpenDaylight controller.
+
+Introduction
+============
+
+This scenario is used primarily to validate and deploy a Stein OpenStack
+with OpenDaylight Neon 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
+OpenDaylight as a SDN controller on the dedicated node.
+
+
+Scenario usage overview
+=======================
+
+Simply deploy this scenario by setting up os-odl-nofeature-noha as scenario
+deploy parameter.
+
+
+Limitations, Issues and Workarounds
+===================================
+
+Tested on virtual deploy only.
+
+References
+==========
+
+For more information on the OPNFV Iruya release, please visit
+https://www.opnfv.org/software
diff --git a/docs/release/userguide/userguide.rst b/docs/release/userguide/userguide.rst
index 6b9b7617f..5a467ba7e 100644
--- a/docs/release/userguide/userguide.rst
+++ b/docs/release/userguide/userguide.rst
@@ -9,7 +9,7 @@ OPNFV Fuel User Guide
Abstract
========
-This document contains details about using OPNFV Fuel ``Hunter`` release after
+This document contains details about using OPNFV Fuel ``Iruya`` release after
it was deployed. For details on how to deploy OpenStack, check
the installation instructions in the :ref:`fuel_userguide_references` section.
diff --git a/mcp/patches/salt-formula-maas/0006-curtin-Add-Bionic-support.patch b/mcp/patches/salt-formula-maas/0006-curtin-Add-Bionic-support.patch
index 791f8eec7..c69507b20 100644
--- a/mcp/patches/salt-formula-maas/0006-curtin-Add-Bionic-support.patch
+++ b/mcp/patches/salt-formula-maas/0006-curtin-Add-Bionic-support.patch
@@ -12,19 +12,19 @@ Subject: [PATCH] curtin: Add Bionic support
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
---
- .../curtin_userdata_amd64_generic_bionic | 83 +++++++++++++++++++
- .../curtin_userdata_arm64_generic_bionic | 78 +++++++++++++++++
+ .../curtin_userdata_amd64_generic_bionic | 84 +++++++++++++++++++
+ .../curtin_userdata_arm64_generic_bionic | 79 +++++++++++++++++
maas/region.sls | 24 ++++++
- 3 files changed, 185 insertions(+)
+ 3 files changed, 187 insertions(+)
create mode 100644 maas/files/curtin_userdata_amd64_generic_bionic
create mode 100644 maas/files/curtin_userdata_arm64_generic_bionic
diff --git a/maas/files/curtin_userdata_amd64_generic_bionic b/maas/files/curtin_userdata_amd64_generic_bionic
new file mode 100644
-index 0000000..c28721a
+index 0000000..11af3cf
--- /dev/null
+++ b/maas/files/curtin_userdata_amd64_generic_bionic
-@@ -0,0 +1,83 @@
+@@ -0,0 +1,84 @@
+{%- from "maas/map.jinja" import cluster with context %}
+{%- raw %}
+#cloud-config
@@ -33,8 +33,9 @@ index 0000000..c28721a
+ {{for line in str(curtin_preseed).splitlines()}}
+ {{line}}
+ {{endfor}}
-+{{if third_party_drivers and driver}}
+early_commands:
++ thin_tools_install: ["sh", "-c", "apt-get update --quiet && apt-get --assume-yes install thin-provisioning-tools"]
++{{if third_party_drivers and driver}}
+ {{py: key_string = ''.join(['\\x%x' % x for x in map(ord, driver['key_binary'])])}}
+ driver_00_get_key: /bin/echo -en '{{key_string}}' > /tmp/maas-{{driver['package']}}.gpg
+ driver_01_add_key: ["apt-key", "add", "/tmp/maas-{{driver['package']}}.gpg"]
@@ -110,10 +111,10 @@ index 0000000..c28721a
+#}
diff --git a/maas/files/curtin_userdata_arm64_generic_bionic b/maas/files/curtin_userdata_arm64_generic_bionic
new file mode 100644
-index 0000000..d14388a
+index 0000000..006d8c2
--- /dev/null
+++ b/maas/files/curtin_userdata_arm64_generic_bionic
-@@ -0,0 +1,78 @@
+@@ -0,0 +1,79 @@
+{%- from "maas/map.jinja" import cluster with context %}
+{% raw %}
+#cloud-config
@@ -122,8 +123,9 @@ index 0000000..d14388a
+ {{for line in str(curtin_preseed).splitlines()}}
+ {{line}}
+ {{endfor}}
-+{{if third_party_drivers and driver}}
+early_commands:
++ thin_tools_install: ["sh", "-c", "apt-get update --quiet && apt-get --assume-yes install thin-provisioning-tools"]
++{{if third_party_drivers and driver}}
+ {{py: key_string = ''.join(['\\x%x' % x for x in map(ord, driver['key_binary'])])}}
+ driver_00_get_key: /bin/echo -en '{{key_string}}' > /tmp/maas-{{driver['package']}}.gpg
+ driver_01_add_key: ["apt-key", "add", "/tmp/maas-{{driver['package']}}.gpg"]
diff --git a/mcp/reclass/classes/cluster/all-mcp-arch-common/infra/maas.yml.j2 b/mcp/reclass/classes/cluster/all-mcp-arch-common/infra/maas.yml.j2
index f98040b93..f3b1f79aa 100644
--- a/mcp/reclass/classes/cluster/all-mcp-arch-common/infra/maas.yml.j2
+++ b/mcp/reclass/classes/cluster/all-mcp-arch-common/infra/maas.yml.j2
@@ -33,7 +33,7 @@ parameters:
aarch64_hugepages_1g:
comment: 'Enable 1G pagesizes on aarch64'
definition: '//capability[@id="asimd"]|//capability[@id="cp15_barrier"]'
- kernel_opts: 'default_hugepagesz=1G hugepagesz=1G'
+ kernel_opts: 'default_hugepagesz=1G hugepagesz=1G kpti=off'
{%- endif %}
enable_iframe: False
timeout:
@@ -111,6 +111,7 @@ parameters:
enable_third_party_drivers: true
network_discovery: 'enabled'
default_min_hwe_kernel: ${_param:hwe_kernel}
+ kernel_opts: 'spectre_v2=off nopti kpti=off nospec_store_bypass_disable noibrs noibpb'
cluster:
saltstack_repo_bionic: "deb [arch=amd64] http://repo.saltstack.com/apt/ubuntu/18.04/amd64/2017.7/ bionic main"
region:
diff --git a/mcp/reclass/classes/cluster/mcp-common-ha/infra/kvm.yml.j2 b/mcp/reclass/classes/cluster/mcp-common-ha/infra/kvm.yml.j2
index fe337fa5b..37bc42225 100644
--- a/mcp/reclass/classes/cluster/mcp-common-ha/infra/kvm.yml.j2
+++ b/mcp/reclass/classes/cluster/mcp-common-ha/infra/kvm.yml.j2
@@ -41,6 +41,7 @@ parameters:
boot_options:
- spectre_v2=off
- nopti
+ - kpti=off
- nospec_store_bypass_disable
- noibrs
- noibpb
diff --git a/mcp/reclass/classes/cluster/mcp-common-ha/openstack_compute.yml b/mcp/reclass/classes/cluster/mcp-common-ha/openstack_compute.yml
index 411fcee5a..af87d9c2f 100644
--- a/mcp/reclass/classes/cluster/mcp-common-ha/openstack_compute.yml
+++ b/mcp/reclass/classes/cluster/mcp-common-ha/openstack_compute.yml
@@ -73,6 +73,7 @@ parameters:
boot_options:
- spectre_v2=off
- nopti
+ - kpti=off
- nospec_store_bypass_disable
- noibrs
- noibpb
diff --git a/mcp/reclass/classes/cluster/mcp-fdio-noha/openstack/compute.yml.j2 b/mcp/reclass/classes/cluster/mcp-fdio-noha/openstack/compute.yml.j2
index cefed963e..14b8a268b 100644
--- a/mcp/reclass/classes/cluster/mcp-fdio-noha/openstack/compute.yml.j2
+++ b/mcp/reclass/classes/cluster/mcp-fdio-noha/openstack/compute.yml.j2
@@ -41,6 +41,7 @@ parameters:
boot_options:
- spectre_v2=off
- nopti
+ - kpti=off
- nospec_store_bypass_disable
- noibrs
- noibpb
diff --git a/mcp/reclass/classes/cluster/mcp-fdio-noha/openstack/gateway.yml b/mcp/reclass/classes/cluster/mcp-fdio-noha/openstack/gateway.yml
index 2dfe0370d..c330b677c 100644
--- a/mcp/reclass/classes/cluster/mcp-fdio-noha/openstack/gateway.yml
+++ b/mcp/reclass/classes/cluster/mcp-fdio-noha/openstack/gateway.yml
@@ -48,6 +48,7 @@ parameters:
boot_options:
- spectre_v2=off
- nopti
+ - kpti=off
- nospec_store_bypass_disable
- noibrs
- noibpb
diff --git a/mcp/reclass/classes/cluster/mcp-iec-noha/infra/kvm.yml.j2 b/mcp/reclass/classes/cluster/mcp-iec-noha/infra/kvm.yml.j2
index 95b39f637..34372c69c 100644
--- a/mcp/reclass/classes/cluster/mcp-iec-noha/infra/kvm.yml.j2
+++ b/mcp/reclass/classes/cluster/mcp-iec-noha/infra/kvm.yml.j2
@@ -62,6 +62,7 @@ parameters:
boot_options:
- spectre_v2=off
- nopti
+ - kpti=off
sysctl:
net.ipv4.ip_forward: 0
libvirt: