From c6a4fcf01b5bcb0533d552d761f7462190df44b7 Mon Sep 17 00:00:00 2001
From: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Date: Thu, 13 Dec 2018 15:05:35 +0100
Subject: [docs] Updates for Gambia 7.1.0 release
While at it, rename FDIO (VPP) scenarios to align with OPNFV FDS
and OPNFV Apex projects.
Change-Id: I9aab5dc4a0dc41a2cc996687a8a2726d03288678
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
---
.../installation/installation.instruction.rst | 4 +-
docs/release/release-notes/release-notes.rst | 36 +++++++++--------
docs/release/scenarios/index.rst | 4 +-
docs/release/scenarios/os-nosdn-fdio-ha/index.rst | 14 +++++++
.../os-nosdn-fdio-ha/os-nosdn-fdio-ha.rst | 41 ++++++++++++++++++++
.../release/scenarios/os-nosdn-fdio-noha/index.rst | 14 +++++++
.../os-nosdn-fdio-noha/os-nosdn-fdio-noha.rst | 39 +++++++++++++++++++
.../scenarios/os-nosdn-ovs-ha/os-nosdn-ovs-ha.rst | 2 +-
.../os-nosdn-ovs-noha/os-nosdn-ovs-noha.rst | 2 +-
docs/release/scenarios/os-nosdn-vpp-ha/index.rst | 14 -------
.../scenarios/os-nosdn-vpp-ha/os-nosdn-vpp-ha.rst | 41 --------------------
docs/release/scenarios/os-nosdn-vpp-noha/index.rst | 14 -------
.../os-nosdn-vpp-noha/os-nosdn-vpp-noha.rst | 39 -------------------
.../scenarios/os-odl-ovs-noha/os-odl-ovs-noha.rst | 4 +-
.../os-ovn-nofeature-ha/os-ovn-nofeature-ha.rst | 2 +-
.../os-ovn-nofeature-noha.rst | 2 +-
mcp/config/scenario/os-nosdn-fdio-ha.yaml | 45 ++++++++++++++++++++++
mcp/config/scenario/os-nosdn-fdio-noha.yaml | 27 +++++++++++++
mcp/config/scenario/os-nosdn-vpp-ha.yaml | 45 ----------------------
mcp/config/scenario/os-nosdn-vpp-noha.yaml | 27 -------------
.../classes/cluster/mcp-fdio-ha/infra/config.yml | 12 ++++++
.../classes/cluster/mcp-fdio-ha/infra/init.yml | 14 +++++++
.../cluster/mcp-fdio-ha/infra/init_vcp.yml.j2 | 12 ++++++
.../classes/cluster/mcp-fdio-ha/infra/kvm.yml.j2 | 14 +++++++
.../classes/cluster/mcp-fdio-ha/infra/maas.yml | 11 ++++++
mcp/reclass/classes/cluster/mcp-fdio-ha/init.yml | 12 ++++++
.../cluster/mcp-fdio-ha/openstack/compute.yml | 17 ++++++++
.../mcp-fdio-ha/openstack/compute_pdf.yml.j2 | 36 +++++++++++++++++
.../cluster/mcp-fdio-ha/openstack/control.yml | 13 +++++++
.../cluster/mcp-fdio-ha/openstack/database.yml | 12 ++++++
.../classes/cluster/mcp-fdio-ha/openstack/init.yml | 13 +++++++
.../mcp-fdio-ha/openstack/message_queue.yml | 12 ++++++
.../cluster/mcp-fdio-ha/openstack/proxy.yml | 12 ++++++
.../cluster/mcp-fdio-ha/openstack/telemetry.yml | 12 ++++++
.../classes/cluster/mcp-fdio-noha/infra/config.yml | 22 +++++++++++
.../classes/cluster/mcp-fdio-noha/infra/init.yml | 14 +++++++
.../classes/cluster/mcp-fdio-noha/infra/maas.yml | 11 ++++++
mcp/reclass/classes/cluster/mcp-fdio-noha/init.yml | 12 ++++++
.../cluster/mcp-fdio-noha/openstack/compute.yml.j2 | 32 +++++++++++++++
.../cluster/mcp-fdio-noha/openstack/control.yml | 12 ++++++
.../cluster/mcp-fdio-noha/openstack/gateway.yml.j2 | 28 ++++++++++++++
.../cluster/mcp-fdio-noha/openstack/init.yml | 13 +++++++
.../classes/cluster/mcp-vpp-ha/infra/config.yml | 12 ------
.../classes/cluster/mcp-vpp-ha/infra/init.yml | 14 -------
.../cluster/mcp-vpp-ha/infra/init_vcp.yml.j2 | 12 ------
.../classes/cluster/mcp-vpp-ha/infra/kvm.yml.j2 | 14 -------
.../classes/cluster/mcp-vpp-ha/infra/maas.yml | 11 ------
mcp/reclass/classes/cluster/mcp-vpp-ha/init.yml | 12 ------
.../cluster/mcp-vpp-ha/openstack/compute.yml | 17 --------
.../mcp-vpp-ha/openstack/compute_pdf.yml.j2 | 36 -----------------
.../cluster/mcp-vpp-ha/openstack/control.yml | 13 -------
.../cluster/mcp-vpp-ha/openstack/database.yml | 12 ------
.../classes/cluster/mcp-vpp-ha/openstack/init.yml | 13 -------
.../cluster/mcp-vpp-ha/openstack/message_queue.yml | 12 ------
.../classes/cluster/mcp-vpp-ha/openstack/proxy.yml | 12 ------
.../cluster/mcp-vpp-ha/openstack/telemetry.yml | 12 ------
.../classes/cluster/mcp-vpp-noha/infra/config.yml | 22 -----------
.../classes/cluster/mcp-vpp-noha/infra/init.yml | 14 -------
.../classes/cluster/mcp-vpp-noha/infra/maas.yml | 11 ------
mcp/reclass/classes/cluster/mcp-vpp-noha/init.yml | 12 ------
.../cluster/mcp-vpp-noha/openstack/compute.yml.j2 | 32 ---------------
.../cluster/mcp-vpp-noha/openstack/control.yml | 12 ------
.../cluster/mcp-vpp-noha/openstack/gateway.yml.j2 | 28 --------------
.../cluster/mcp-vpp-noha/openstack/init.yml | 13 -------
mcp/reclass/nodes/cfg01.mcp-fdio-ha.local.yml | 18 +++++++++
mcp/reclass/nodes/cfg01.mcp-fdio-noha.local.yml | 18 +++++++++
mcp/reclass/nodes/cfg01.mcp-vpp-ha.local.yml | 18 ---------
mcp/reclass/nodes/cfg01.mcp-vpp-noha.local.yml | 18 ---------
68 files changed, 593 insertions(+), 587 deletions(-)
create mode 100644 docs/release/scenarios/os-nosdn-fdio-ha/index.rst
create mode 100644 docs/release/scenarios/os-nosdn-fdio-ha/os-nosdn-fdio-ha.rst
create mode 100644 docs/release/scenarios/os-nosdn-fdio-noha/index.rst
create mode 100644 docs/release/scenarios/os-nosdn-fdio-noha/os-nosdn-fdio-noha.rst
delete mode 100644 docs/release/scenarios/os-nosdn-vpp-ha/index.rst
delete mode 100644 docs/release/scenarios/os-nosdn-vpp-ha/os-nosdn-vpp-ha.rst
delete mode 100644 docs/release/scenarios/os-nosdn-vpp-noha/index.rst
delete mode 100644 docs/release/scenarios/os-nosdn-vpp-noha/os-nosdn-vpp-noha.rst
create mode 100644 mcp/config/scenario/os-nosdn-fdio-ha.yaml
create mode 100644 mcp/config/scenario/os-nosdn-fdio-noha.yaml
delete mode 100644 mcp/config/scenario/os-nosdn-vpp-ha.yaml
delete mode 100644 mcp/config/scenario/os-nosdn-vpp-noha.yaml
create mode 100644 mcp/reclass/classes/cluster/mcp-fdio-ha/infra/config.yml
create mode 100644 mcp/reclass/classes/cluster/mcp-fdio-ha/infra/init.yml
create mode 100644 mcp/reclass/classes/cluster/mcp-fdio-ha/infra/init_vcp.yml.j2
create mode 100644 mcp/reclass/classes/cluster/mcp-fdio-ha/infra/kvm.yml.j2
create mode 100644 mcp/reclass/classes/cluster/mcp-fdio-ha/infra/maas.yml
create mode 100644 mcp/reclass/classes/cluster/mcp-fdio-ha/init.yml
create mode 100644 mcp/reclass/classes/cluster/mcp-fdio-ha/openstack/compute.yml
create mode 100644 mcp/reclass/classes/cluster/mcp-fdio-ha/openstack/compute_pdf.yml.j2
create mode 100644 mcp/reclass/classes/cluster/mcp-fdio-ha/openstack/control.yml
create mode 100644 mcp/reclass/classes/cluster/mcp-fdio-ha/openstack/database.yml
create mode 100644 mcp/reclass/classes/cluster/mcp-fdio-ha/openstack/init.yml
create mode 100644 mcp/reclass/classes/cluster/mcp-fdio-ha/openstack/message_queue.yml
create mode 100644 mcp/reclass/classes/cluster/mcp-fdio-ha/openstack/proxy.yml
create mode 100644 mcp/reclass/classes/cluster/mcp-fdio-ha/openstack/telemetry.yml
create mode 100644 mcp/reclass/classes/cluster/mcp-fdio-noha/infra/config.yml
create mode 100644 mcp/reclass/classes/cluster/mcp-fdio-noha/infra/init.yml
create mode 100644 mcp/reclass/classes/cluster/mcp-fdio-noha/infra/maas.yml
create mode 100644 mcp/reclass/classes/cluster/mcp-fdio-noha/init.yml
create mode 100644 mcp/reclass/classes/cluster/mcp-fdio-noha/openstack/compute.yml.j2
create mode 100644 mcp/reclass/classes/cluster/mcp-fdio-noha/openstack/control.yml
create mode 100644 mcp/reclass/classes/cluster/mcp-fdio-noha/openstack/gateway.yml.j2
create mode 100644 mcp/reclass/classes/cluster/mcp-fdio-noha/openstack/init.yml
delete mode 100644 mcp/reclass/classes/cluster/mcp-vpp-ha/infra/config.yml
delete mode 100644 mcp/reclass/classes/cluster/mcp-vpp-ha/infra/init.yml
delete mode 100644 mcp/reclass/classes/cluster/mcp-vpp-ha/infra/init_vcp.yml.j2
delete mode 100644 mcp/reclass/classes/cluster/mcp-vpp-ha/infra/kvm.yml.j2
delete mode 100644 mcp/reclass/classes/cluster/mcp-vpp-ha/infra/maas.yml
delete mode 100644 mcp/reclass/classes/cluster/mcp-vpp-ha/init.yml
delete mode 100644 mcp/reclass/classes/cluster/mcp-vpp-ha/openstack/compute.yml
delete mode 100644 mcp/reclass/classes/cluster/mcp-vpp-ha/openstack/compute_pdf.yml.j2
delete mode 100644 mcp/reclass/classes/cluster/mcp-vpp-ha/openstack/control.yml
delete mode 100644 mcp/reclass/classes/cluster/mcp-vpp-ha/openstack/database.yml
delete mode 100644 mcp/reclass/classes/cluster/mcp-vpp-ha/openstack/init.yml
delete mode 100644 mcp/reclass/classes/cluster/mcp-vpp-ha/openstack/message_queue.yml
delete mode 100644 mcp/reclass/classes/cluster/mcp-vpp-ha/openstack/proxy.yml
delete mode 100644 mcp/reclass/classes/cluster/mcp-vpp-ha/openstack/telemetry.yml
delete mode 100644 mcp/reclass/classes/cluster/mcp-vpp-noha/infra/config.yml
delete mode 100644 mcp/reclass/classes/cluster/mcp-vpp-noha/infra/init.yml
delete mode 100644 mcp/reclass/classes/cluster/mcp-vpp-noha/infra/maas.yml
delete mode 100644 mcp/reclass/classes/cluster/mcp-vpp-noha/init.yml
delete mode 100644 mcp/reclass/classes/cluster/mcp-vpp-noha/openstack/compute.yml.j2
delete mode 100644 mcp/reclass/classes/cluster/mcp-vpp-noha/openstack/control.yml
delete mode 100644 mcp/reclass/classes/cluster/mcp-vpp-noha/openstack/gateway.yml.j2
delete mode 100644 mcp/reclass/classes/cluster/mcp-vpp-noha/openstack/init.yml
create mode 100644 mcp/reclass/nodes/cfg01.mcp-fdio-ha.local.yml
create mode 100644 mcp/reclass/nodes/cfg01.mcp-fdio-noha.local.yml
delete mode 100644 mcp/reclass/nodes/cfg01.mcp-vpp-ha.local.yml
delete mode 100644 mcp/reclass/nodes/cfg01.mcp-vpp-noha.local.yml
diff --git a/docs/release/installation/installation.instruction.rst b/docs/release/installation/installation.instruction.rst
index 183a6f668..d17bc6440 100644
--- a/docs/release/installation/installation.instruction.rst
+++ b/docs/release/installation/installation.instruction.rst
@@ -963,7 +963,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-7.0.0
+ jenkins@jumpserver:~/fuel$ git checkout opnfv-7.1.0
jenkins@jumpserver:~/fuel$ ci/deploy.sh -l <lab_name> \
-p <pod_name> \
-b <URI to configuration repo containing the PDF/IDF files> \
@@ -1369,7 +1369,7 @@ article.
References
==========
-For more information on the OPNFV ``Gambia`` 7.0 release, please see:
+For more information on the OPNFV ``Gambia`` 7.1 release, please see:
#. `OPNFV Home Page`_
#. `OPNFV Documentation`_
diff --git a/docs/release/release-notes/release-notes.rst b/docs/release/release-notes/release-notes.rst
index 2602a69c4..4c6c3bd50 100644
--- a/docs/release/release-notes/release-notes.rst
+++ b/docs/release/release-notes/release-notes.rst
@@ -77,16 +77,16 @@ Release Data
| **Project** | fuel |
| | |
+--------------------------------------+--------------------------------------+
-| **Repo/tag** | opnfv-7.0.0 |
+| **Repo/tag** | opnfv-7.1.0 |
| | |
+--------------------------------------+--------------------------------------+
-| **Release designation** | Gambia 7.0 |
+| **Release designation** | Gambia 7.1 |
| | |
+--------------------------------------+--------------------------------------+
-| **Release date** | November 9, 2018 |
+| **Release date** | December 14, 2018 |
| | |
+--------------------------------------+--------------------------------------+
-| **Purpose of the delivery** | OPNFV Gambia 7.0 release |
+| **Purpose of the delivery** | OPNFV Gambia 7.1 release |
+--------------------------------------+--------------------------------------+
Version Change
@@ -109,7 +109,7 @@ deployment toolchain. It is based on following upstream versions:
Document Changes
~~~~~~~~~~~~~~~~
-This is the ``Gambia`` 7.0 release.
+This is the ``Gambia`` 7.1 release.
It comes with the following documentation:
- :ref:`OPNFV Fuel Installation Instruction <fuel-installation>`
@@ -130,13 +130,17 @@ Feature Additions
- ``baremetal`` support for noHA deployments;
- containerized Salt Master;
- ``OVN`` scenarios;
+- ``ODL`` ``BGPVPN`` scenario;
+- ``IDF`` support for configuring cluster-level ``MTU``;
-For an exhaustive list, see the `OPNFV Fuel JIRA: Gambia New features`_ filter.
+For an exhaustive list, see the `OPNFV Fuel JIRA: Gambia 7.1 New features`_
+filter.
Bug Corrections
~~~~~~~~~~~~~~~
-For an exhaustive list, see the `OPNFV Fuel JIRA: Gambia Bugs (fixed)`_ filter.
+For an exhaustive list, see the `OPNFV Fuel JIRA: Gambia 7.1 Bugs (fixed)`_
+filter.
Software Deliverables
~~~~~~~~~~~~~~~~~~~~~
@@ -205,23 +209,25 @@ System Limitations
Known Issues
------------
-For an exhaustive list, see the `OPNFV Fuel JIRA: Gambia Known issues`_ filter.
+For an exhaustive list, see the `OPNFV Fuel JIRA: Gambia 7.1 Known issues`_
+filter.
Workarounds
-----------
-For an exhaustive list, see the `OPNFV Fuel JIRA: Gambia Workarounds`_ filter.
+For an exhaustive list, see the `OPNFV Fuel JIRA: Gambia 7.1 Workarounds`_
+filter.
Test Results
============
-The ``Gambia`` 7.0 release with the Fuel deployment tool has undergone QA test
+The ``Gambia`` 7.1 release with the Fuel deployment tool has undergone QA test
runs, see separate test results.
References
==========
-For more information on the OPNFV ``Gambia`` 7.0 release, please see:
+For more information on the OPNFV ``Gambia`` 7.1 release, please see:
#. `OPNFV Home Page`_
#. `OPNFV Documentation`_
@@ -246,7 +252,7 @@ For more information on the OPNFV ``Gambia`` 7.0 release, please see:
.. _`OPNFV Software Downloads`: https://www.opnfv.org/software/downloads
.. _`Apache License 2.0`: https://www.apache.org/licenses/LICENSE-2.0
.. OPNFV Fuel Gambia JIRA filters
-.. _`OPNFV Fuel JIRA: Gambia Bugs (fixed)`: https://jira.opnfv.org/issues/?filter=12503
-.. _`OPNFV Fuel JIRA: Gambia New features`: https://jira.opnfv.org/issues/?filter=12504
-.. _`OPNFV Fuel JIRA: Gambia Known issues`: https://jira.opnfv.org/issues/?filter=12505
-.. _`OPNFV Fuel JIRA: Gambia Workarounds`: https://jira.opnfv.org/issues/?filter=12506
+.. _`OPNFV Fuel JIRA: Gambia 7.1 Bugs (fixed)`: https://jira.opnfv.org/issues/?filter=12601
+.. _`OPNFV Fuel JIRA: Gambia 7.1 New features`: https://jira.opnfv.org/issues/?filter=12600
+.. _`OPNFV Fuel JIRA: Gambia 7.1 Known issues`: https://jira.opnfv.org/issues/?filter=12602
+.. _`OPNFV Fuel JIRA: Gambia 7.1 Workarounds`: https://jira.opnfv.org/issues/?filter=12603
diff --git a/docs/release/scenarios/index.rst b/docs/release/scenarios/index.rst
index 48d78b5d3..437a82e2d 100644
--- a/docs/release/scenarios/index.rst
+++ b/docs/release/scenarios/index.rst
@@ -15,6 +15,6 @@ OPNFV Fuel Scenarios
os-nosdn-ovs-ha/index.rst
os-ovn-nofeature-noha/index.rst
os-ovn-nofeature-ha/index.rst
- os-nosdn-vpp-noha/index.rst
- os-nosdn-vpp-ha/index.rst
+ os-nosdn-fdio-noha/index.rst
+ os-nosdn-fdio-ha/index.rst
os-odl-ovs-noha/index.rst
diff --git a/docs/release/scenarios/os-nosdn-fdio-ha/index.rst b/docs/release/scenarios/os-nosdn-fdio-ha/index.rst
new file mode 100644
index 000000000..5f14536ac
--- /dev/null
+++ b/docs/release/scenarios/os-nosdn-fdio-ha/index.rst
@@ -0,0 +1,14 @@
+.. _os-nosdn-fdio-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-fdio-ha overview and description
+=========================================
+
+.. toctree::
+ :maxdepth: 2
+
+.. include:: os-nosdn-fdio-ha.rst
diff --git a/docs/release/scenarios/os-nosdn-fdio-ha/os-nosdn-fdio-ha.rst b/docs/release/scenarios/os-nosdn-fdio-ha/os-nosdn-fdio-ha.rst
new file mode 100644
index 000000000..96c266996
--- /dev/null
+++ b/docs/release/scenarios/os-nosdn-fdio-ha/os-nosdn-fdio-ha.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) 2018 Mirantis Inc., Enea Software AB and others
+
+This document provides scenario level details for Gambia 7.1 of
+deployment with no SDN controller and VPP enabled as virtual switch.
+
+Introduction
+============
+
+This scenario is used primarily to validate and deploy a Queens OpenStack
+deployment with no SDN controller enabled and VPP as virtual switch.
+
+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
+VPP on the compute nodes as virtual switch.
+
+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-fdio-ha as scenario
+deploy parameter.
+
+Limitations, Issues and Workarounds
+===================================
+
+None
+
+References
+==========
+
+For more information on the OPNFV Gambia release, please visit
+https://www.opnfv.org/software
diff --git a/docs/release/scenarios/os-nosdn-fdio-noha/index.rst b/docs/release/scenarios/os-nosdn-fdio-noha/index.rst
new file mode 100644
index 000000000..e64d9607e
--- /dev/null
+++ b/docs/release/scenarios/os-nosdn-fdio-noha/index.rst
@@ -0,0 +1,14 @@
+.. _os-nosdn-fdio-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-fdio-noha overview and description
+===========================================
+
+.. toctree::
+ :maxdepth: 2
+
+.. include:: os-nosdn-fdio-noha.rst
diff --git a/docs/release/scenarios/os-nosdn-fdio-noha/os-nosdn-fdio-noha.rst b/docs/release/scenarios/os-nosdn-fdio-noha/os-nosdn-fdio-noha.rst
new file mode 100644
index 000000000..542ec3afa
--- /dev/null
+++ b/docs/release/scenarios/os-nosdn-fdio-noha/os-nosdn-fdio-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 Gambia 7.1 of
+deployment with no SDN controller and VPP enabled as virtual switch.
+
+Introduction
+============
+
+This scenario is used primarily to validate and deploy a Queens OpenStack
+deployment with no SDN controller enabled and VPP as virtual switch.
+
+
+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
+VPP on the compute nodes as virtual switch.
+
+
+Scenario usage overview
+=======================
+
+Simply deploy this scenario by setting os-nosdn-fdio-noha as scenario
+deploy parameter.
+
+
+Limitations, Issues and Workarounds
+===================================
+
+Tested on virtual deploy only.
+
+References
+==========
+
+For more information on the OPNFV Gambia release, please visit
+https://www.opnfv.org/software
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
index e653a6232..f557dbb9c 100644
--- 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
@@ -2,7 +2,7 @@
.. http://creativecommons.org/licenses/by/4.0
.. (c) 2018 Mirantis Inc., Enea Software AB and others
-This document provides scenario level details for Gambia 7.0 of
+This document provides scenario level details for Gambia 7.1 of
deployment with no SDN controller and no extra features enabled.
Introduction
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
index 42f6ccc36..2ac863a5d 100644
--- 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
@@ -2,7 +2,7 @@
.. http://creativecommons.org/licenses/by/4.0
.. (c) 2018 Mirantis Inc., Enea Software AB and others
-This document provides scenario level details for Gambia 7.0 of
+This document provides scenario level details for Gambia 7.1 of
deployment with no SDN controller and no extra features enabled.
Introduction
diff --git a/docs/release/scenarios/os-nosdn-vpp-ha/index.rst b/docs/release/scenarios/os-nosdn-vpp-ha/index.rst
deleted file mode 100644
index d4d5a46ef..000000000
--- a/docs/release/scenarios/os-nosdn-vpp-ha/index.rst
+++ /dev/null
@@ -1,14 +0,0 @@
-.. _os-nosdn-vpp-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-vpp-ha overview and description
-========================================
-
-.. toctree::
- :maxdepth: 2
-
-.. include:: os-nosdn-vpp-ha.rst
diff --git a/docs/release/scenarios/os-nosdn-vpp-ha/os-nosdn-vpp-ha.rst b/docs/release/scenarios/os-nosdn-vpp-ha/os-nosdn-vpp-ha.rst
deleted file mode 100644
index 80c829acc..000000000
--- a/docs/release/scenarios/os-nosdn-vpp-ha/os-nosdn-vpp-ha.rst
+++ /dev/null
@@ -1,41 +0,0 @@
-.. 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 Gambia 7.0 of
-deployment with no SDN controller and VPP enabled as virtual switch.
-
-Introduction
-============
-
-This scenario is used primarily to validate and deploy a Queens OpenStack
-deployment with no SDN controller enabled and VPP as virtual switch.
-
-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
-VPP on the compute nodes as virtual switch.
-
-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-vpp-ha as scenario
-deploy parameter.
-
-Limitations, Issues and Workarounds
-===================================
-
-None
-
-References
-==========
-
-For more information on the OPNFV Gambia release, please visit
-https://www.opnfv.org/software
diff --git a/docs/release/scenarios/os-nosdn-vpp-noha/index.rst b/docs/release/scenarios/os-nosdn-vpp-noha/index.rst
deleted file mode 100644
index 35059859d..000000000
--- a/docs/release/scenarios/os-nosdn-vpp-noha/index.rst
+++ /dev/null
@@ -1,14 +0,0 @@
-.. _os-nosdn-vpp-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-vpp-noha overview and description
-==========================================
-
-.. toctree::
- :maxdepth: 2
-
-.. include:: os-nosdn-vpp-noha.rst
diff --git a/docs/release/scenarios/os-nosdn-vpp-noha/os-nosdn-vpp-noha.rst b/docs/release/scenarios/os-nosdn-vpp-noha/os-nosdn-vpp-noha.rst
deleted file mode 100644
index a699779ba..000000000
--- a/docs/release/scenarios/os-nosdn-vpp-noha/os-nosdn-vpp-noha.rst
+++ /dev/null
@@ -1,39 +0,0 @@
-.. 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 Gambia 7.0 of
-deployment with no SDN controller and VPP enabled as virtual switch.
-
-Introduction
-============
-
-This scenario is used primarily to validate and deploy a Queens OpenStack
-deployment with no SDN controller enabled and VPP as virtual switch.
-
-
-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
-VPP on the compute nodes as virtual switch.
-
-
-Scenario usage overview
-=======================
-
-Simply deploy this scenario by setting os-nosdn-vpp-noha as scenario
-deploy parameter.
-
-
-Limitations, Issues and Workarounds
-===================================
-
-Tested on virtual deploy only.
-
-References
-==========
-
-For more information on the OPNFV Gambia release, please visit
-https://www.opnfv.org/software
diff --git a/docs/release/scenarios/os-odl-ovs-noha/os-odl-ovs-noha.rst b/docs/release/scenarios/os-odl-ovs-noha/os-odl-ovs-noha.rst
index 19eb0258e..5fe5d2100 100644
--- a/docs/release/scenarios/os-odl-ovs-noha/os-odl-ovs-noha.rst
+++ b/docs/release/scenarios/os-odl-ovs-noha/os-odl-ovs-noha.rst
@@ -2,7 +2,7 @@
.. http://creativecommons.org/licenses/by/4.0
.. (c) 2018 Mirantis Inc., Enea Software AB and others
-This document provides scenario level details for Gambia 7.0 of
+This document provides scenario level details for Gambia 7.1 of
deployment with OpenDaylight controller and DPDK feature enabled.
Introduction
@@ -37,4 +37,4 @@ References
==========
For more information on the OPNFV Gambia release, please visit
-https://www.opnfv.org/software
\ No newline at end of file
+https://www.opnfv.org/software
diff --git a/docs/release/scenarios/os-ovn-nofeature-ha/os-ovn-nofeature-ha.rst b/docs/release/scenarios/os-ovn-nofeature-ha/os-ovn-nofeature-ha.rst
index 0317c4b5b..65cb5e581 100644
--- a/docs/release/scenarios/os-ovn-nofeature-ha/os-ovn-nofeature-ha.rst
+++ b/docs/release/scenarios/os-ovn-nofeature-ha/os-ovn-nofeature-ha.rst
@@ -2,7 +2,7 @@
.. http://creativecommons.org/licenses/by/4.0
.. (c) 2018 Mirantis Inc., Enea Software AB and others
-This document provides scenario level details for Gambia 7.0 of deployment
+This document provides scenario level details for Gambia 7.1 of deployment
with Open Virtual Network (OVN) providing Layers 2 and 3 networking and no
extra features enabled.
diff --git a/docs/release/scenarios/os-ovn-nofeature-noha/os-ovn-nofeature-noha.rst b/docs/release/scenarios/os-ovn-nofeature-noha/os-ovn-nofeature-noha.rst
index 44bcbfa7c..54fbd6ba0 100644
--- a/docs/release/scenarios/os-ovn-nofeature-noha/os-ovn-nofeature-noha.rst
+++ b/docs/release/scenarios/os-ovn-nofeature-noha/os-ovn-nofeature-noha.rst
@@ -2,7 +2,7 @@
.. http://creativecommons.org/licenses/by/4.0
.. (c) 2018 Mirantis Inc., Enea Software AB and others
-This document provides scenario level details for Gambia 7.0 of deployment
+This document provides scenario level details for Gambia 7.1 of deployment
with Open Virtual Network (OVN) providing Layers 2 and 3 networking and no
extra features enabled.
diff --git a/mcp/config/scenario/os-nosdn-fdio-ha.yaml b/mcp/config/scenario/os-nosdn-fdio-ha.yaml
new file mode 100644
index 000000000..3ff4e5c5d
--- /dev/null
+++ b/mcp/config/scenario/os-nosdn-fdio-ha.yaml
@@ -0,0 +1,45 @@
+##############################################################################
+# Copyright (c) 2018 Mirantis Inc., Enea AB and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Apache License, Version 2.0
+# which accompanies this distribution, and is available at
+# http://www.apache.org/licenses/LICENSE-2.0
+##############################################################################
+---
+cluster:
+ domain: mcp-fdio-ha.local
+ states:
+ - openstack_ha
+ - networks
+virtual:
+ nodes:
+ control:
+ - kvm01
+ - kvm02
+ - kvm03
+ compute:
+ - cmp001
+ - cmp002
+ # Below values are only used for each node if said node is virtual
+ cfg01:
+ vcpus: 4
+ ram: 6144
+ mas01:
+ vcpus: 4
+ ram: 6144
+ # NOTE: We might need to add more RAM here
+ kvm01:
+ vcpus: 4
+ ram: 14336
+ kvm02:
+ vcpus: 4
+ ram: 14336
+ kvm03:
+ vcpus: 4
+ ram: 14336
+ cmp001:
+ vcpus: 4
+ ram: 8192
+ cmp002:
+ vcpus: 4
+ ram: 8192
diff --git a/mcp/config/scenario/os-nosdn-fdio-noha.yaml b/mcp/config/scenario/os-nosdn-fdio-noha.yaml
new file mode 100644
index 000000000..b52a89cf4
--- /dev/null
+++ b/mcp/config/scenario/os-nosdn-fdio-noha.yaml
@@ -0,0 +1,27 @@
+##############################################################################
+# Copyright (c) 2017 Mirantis Inc., Enea AB and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Apache License, Version 2.0
+# which accompanies this distribution, and is available at
+# http://www.apache.org/licenses/LICENSE-2.0
+##############################################################################
+---
+cluster:
+ domain: mcp-fdio-noha.local
+ states:
+ - openstack_noha
+ - neutron_gateway
+ - networks
+virtual:
+ nodes:
+ control:
+ - ctl01
+ - gtw01
+ compute:
+ - cmp001
+ - cmp002
+ ctl01:
+ vcpus: 4
+ ram: 14336
+ gtw01:
+ ram: 2048
diff --git a/mcp/config/scenario/os-nosdn-vpp-ha.yaml b/mcp/config/scenario/os-nosdn-vpp-ha.yaml
deleted file mode 100644
index 9e7ebc1e2..000000000
--- a/mcp/config/scenario/os-nosdn-vpp-ha.yaml
+++ /dev/null
@@ -1,45 +0,0 @@
-##############################################################################
-# Copyright (c) 2018 Mirantis Inc., Enea AB and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Apache License, Version 2.0
-# which accompanies this distribution, and is available at
-# http://www.apache.org/licenses/LICENSE-2.0
-##############################################################################
----
-cluster:
- domain: mcp-vpp-ha.local
- states:
- - openstack_ha
- - networks
-virtual:
- nodes:
- control:
- - kvm01
- - kvm02
- - kvm03
- compute:
- - cmp001
- - cmp002
- # Below values are only used for each node if said node is virtual
- cfg01:
- vcpus: 4
- ram: 6144
- mas01:
- vcpus: 4
- ram: 6144
- # NOTE: We might need to add more RAM here
- kvm01:
- vcpus: 4
- ram: 14336
- kvm02:
- vcpus: 4
- ram: 14336
- kvm03:
- vcpus: 4
- ram: 14336
- cmp001:
- vcpus: 4
- ram: 8192
- cmp002:
- vcpus: 4
- ram: 8192
diff --git a/mcp/config/scenario/os-nosdn-vpp-noha.yaml b/mcp/config/scenario/os-nosdn-vpp-noha.yaml
deleted file mode 100644
index e90300407..000000000
--- a/mcp/config/scenario/os-nosdn-vpp-noha.yaml
+++ /dev/null
@@ -1,27 +0,0 @@
-##############################################################################
-# Copyright (c) 2017 Mirantis Inc., Enea AB and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Apache License, Version 2.0
-# which accompanies this distribution, and is available at
-# http://www.apache.org/licenses/LICENSE-2.0
-##############################################################################
----
-cluster:
- domain: mcp-vpp-noha.local
- states:
- - openstack_noha
- - neutron_gateway
- - networks
-virtual:
- nodes:
- control:
- - ctl01
- - gtw01
- compute:
- - cmp001
- - cmp002
- ctl01:
- vcpus: 4
- ram: 14336
- gtw01:
- ram: 2048
diff --git a/mcp/reclass/classes/cluster/mcp-fdio-ha/infra/config.yml b/mcp/reclass/classes/cluster/mcp-fdio-ha/infra/config.yml
new file mode 100644
index 000000000..1bf5f0014
--- /dev/null
+++ b/mcp/reclass/classes/cluster/mcp-fdio-ha/infra/config.yml
@@ -0,0 +1,12 @@
+##############################################################################
+# Copyright (c) 2018 Mirantis Inc., Enea AB and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Apache License, Version 2.0
+# which accompanies this distribution, and is available at
+# http://www.apache.org/licenses/LICENSE-2.0
+##############################################################################
+---
+classes:
+ - cluster.mcp-common-ha.infra.config
+ - cluster.mcp-fdio-ha.infra
+ - cluster.all-mcp-arch-common.infra.config_pdf
diff --git a/mcp/reclass/classes/cluster/mcp-fdio-ha/infra/init.yml b/mcp/reclass/classes/cluster/mcp-fdio-ha/infra/init.yml
new file mode 100644
index 000000000..3ab122e13
--- /dev/null
+++ b/mcp/reclass/classes/cluster/mcp-fdio-ha/infra/init.yml
@@ -0,0 +1,14 @@
+##############################################################################
+# Copyright (c) 2018 Mirantis Inc., Enea AB and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Apache License, Version 2.0
+# which accompanies this distribution, and is available at
+# http://www.apache.org/licenses/LICENSE-2.0
+##############################################################################
+---
+classes:
+ - cluster.mcp-common-ha.infra
+ - cluster.mcp-fdio-ha.openstack
+parameters:
+ _param:
+ cluster_name: mcp-fdio-ha
diff --git a/mcp/reclass/classes/cluster/mcp-fdio-ha/infra/init_vcp.yml.j2 b/mcp/reclass/classes/cluster/mcp-fdio-ha/infra/init_vcp.yml.j2
new file mode 100644
index 000000000..8ab411876
--- /dev/null
+++ b/mcp/reclass/classes/cluster/mcp-fdio-ha/infra/init_vcp.yml.j2
@@ -0,0 +1,12 @@
+##############################################################################
+# Copyright (c) 2018 Mirantis Inc., Enea AB and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Apache License, Version 2.0
+# which accompanies this distribution, and is available at
+# http://www.apache.org/licenses/LICENSE-2.0
+##############################################################################
+---
+{%- if conf.MCP_VCP %}
+classes:
+ - cluster.mcp-fdio-ha.infra
+{%- endif %}
diff --git a/mcp/reclass/classes/cluster/mcp-fdio-ha/infra/kvm.yml.j2 b/mcp/reclass/classes/cluster/mcp-fdio-ha/infra/kvm.yml.j2
new file mode 100644
index 000000000..dbbea5235
--- /dev/null
+++ b/mcp/reclass/classes/cluster/mcp-fdio-ha/infra/kvm.yml.j2
@@ -0,0 +1,14 @@
+##############################################################################
+# Copyright (c) 2018 Mirantis Inc., Enea AB and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Apache License, Version 2.0
+# which accompanies this distribution, and is available at
+# http://www.apache.org/licenses/LICENSE-2.0
+##############################################################################
+---
+{%- if conf.MCP_VCP %}
+# NOTE(armband): we don't want to pull in salt.control for novcp
+classes:
+ - cluster.mcp-common-ha.infra.kvm
+ - cluster.mcp-fdio-ha.infra
+{%- endif %}
diff --git a/mcp/reclass/classes/cluster/mcp-fdio-ha/infra/maas.yml b/mcp/reclass/classes/cluster/mcp-fdio-ha/infra/maas.yml
new file mode 100644
index 000000000..d39e259d1
--- /dev/null
+++ b/mcp/reclass/classes/cluster/mcp-fdio-ha/infra/maas.yml
@@ -0,0 +1,11 @@
+##############################################################################
+# Copyright (c) 2018 Mirantis Inc., Enea AB and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Apache License, Version 2.0
+# which accompanies this distribution, and is available at
+# http://www.apache.org/licenses/LICENSE-2.0
+##############################################################################
+---
+classes:
+ - cluster.all-mcp-arch-common.infra.maas
+ - cluster.mcp-fdio-ha.infra
diff --git a/mcp/reclass/classes/cluster/mcp-fdio-ha/init.yml b/mcp/reclass/classes/cluster/mcp-fdio-ha/init.yml
new file mode 100644
index 000000000..daeecfcc7
--- /dev/null
+++ b/mcp/reclass/classes/cluster/mcp-fdio-ha/init.yml
@@ -0,0 +1,12 @@
+##############################################################################
+# Copyright (c) 2018 Mirantis Inc., Enea AB and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Apache License, Version 2.0
+# which accompanies this distribution, and is available at
+# http://www.apache.org/licenses/LICENSE-2.0
+##############################################################################
+---
+classes:
+ - cluster.all-mcp-arch-common
+ - cluster.mcp-fdio-ha.infra
+ - cluster.mcp-fdio-ha.openstack
diff --git a/mcp/reclass/classes/cluster/mcp-fdio-ha/openstack/compute.yml b/mcp/reclass/classes/cluster/mcp-fdio-ha/openstack/compute.yml
new file mode 100644
index 000000000..4b718abe7
--- /dev/null
+++ b/mcp/reclass/classes/cluster/mcp-fdio-ha/openstack/compute.yml
@@ -0,0 +1,17 @@
+##############################################################################
+# Copyright (c) 2018 Mirantis Inc., Enea AB and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Apache License, Version 2.0
+# which accompanies this distribution, and is available at
+# http://www.apache.org/licenses/LICENSE-2.0
+##############################################################################
+---
+classes:
+ - cluster.mcp-common-ha.openstack_compute
+ - cluster.mcp-fdio-ha.openstack.compute_pdf
+ - cluster.mcp-fdio-ha.infra
+parameters:
+ nova:
+ compute:
+ libvirt_service: libvirtd
+ libvirt_bin: /etc/default/libvirtd
diff --git a/mcp/reclass/classes/cluster/mcp-fdio-ha/openstack/compute_pdf.yml.j2 b/mcp/reclass/classes/cluster/mcp-fdio-ha/openstack/compute_pdf.yml.j2
new file mode 100644
index 000000000..f3844ad8c
--- /dev/null
+++ b/mcp/reclass/classes/cluster/mcp-fdio-ha/openstack/compute_pdf.yml.j2
@@ -0,0 +1,36 @@
+##############################################################################
+# Copyright (c) 2018 Mirantis Inc., Enea AB and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Apache License, Version 2.0
+# which accompanies this distribution, and is available at
+# http://www.apache.org/licenses/LICENSE-2.0
+##############################################################################
+{%- import 'net_map.j2' as nm with context %}
+{%- import 'net_macros.j2' as ma with context %}
+{#- Filter-out NIC duplicates by constructing a dict (used NICs only) #}
+{%- set nics = { nm.cmp001.nic_private: True } %}
+{%- set vlan_private_start = (nm.vlan_private | string).rsplit('-')[0] %}
+{%- set vlans = { vlan_private_start: nm.cmp001.nic_private } %}
+---
+parameters:
+ linux:
+ network:
+ interface:
+
+{#- prevent duplicates for tagged mgmt on the same physical interface as PXE/admin #}
+{%- if nm.cmp001.nic_admin in nics %}
+ {%- do nics.pop(nm.cmp001.nic_admin) %}
+{%- endif %}
+
+{{ ma.linux_network_interfaces_nic(nics) }}
+
+{{ ma.linux_network_interfaces_vlan(vlans) }}
+
+ br-mesh:
+ enabled: true
+ type: bridge
+ address: ${_param:tenant_address}
+ netmask: ${_param:opnfv_net_private_mask}
+ mtu: 1500
+ use_interfaces:
+ - {{ ma.interface_str(nm.cmp001.nic_private, vlan_private_start) }}
diff --git a/mcp/reclass/classes/cluster/mcp-fdio-ha/openstack/control.yml b/mcp/reclass/classes/cluster/mcp-fdio-ha/openstack/control.yml
new file mode 100644
index 000000000..a9bb44907
--- /dev/null
+++ b/mcp/reclass/classes/cluster/mcp-fdio-ha/openstack/control.yml
@@ -0,0 +1,13 @@
+##############################################################################
+# Copyright (c) 2018 Mirantis Inc., Enea AB and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Apache License, Version 2.0
+# which accompanies this distribution, and is available at
+# http://www.apache.org/licenses/LICENSE-2.0
+##############################################################################
+---
+classes:
+ - system.neutron.control.openvswitch.cluster
+ - cluster.mcp-common-ha.openstack_interface_vcp_biport
+ - cluster.mcp-common-ha.openstack_control
+ - cluster.mcp-fdio-ha.infra
diff --git a/mcp/reclass/classes/cluster/mcp-fdio-ha/openstack/database.yml b/mcp/reclass/classes/cluster/mcp-fdio-ha/openstack/database.yml
new file mode 100644
index 000000000..7ba9e5660
--- /dev/null
+++ b/mcp/reclass/classes/cluster/mcp-fdio-ha/openstack/database.yml
@@ -0,0 +1,12 @@
+##############################################################################
+# Copyright (c) 2018 Mirantis Inc., Enea AB and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Apache License, Version 2.0
+# which accompanies this distribution, and is available at
+# http://www.apache.org/licenses/LICENSE-2.0
+##############################################################################
+---
+classes:
+ - cluster.mcp-common-ha.openstack_interface_vcp_biport
+ - cluster.mcp-common-ha.openstack_database
+ - cluster.mcp-fdio-ha.infra.init_vcp
diff --git a/mcp/reclass/classes/cluster/mcp-fdio-ha/openstack/init.yml b/mcp/reclass/classes/cluster/mcp-fdio-ha/openstack/init.yml
new file mode 100644
index 000000000..9dbfd59a1
--- /dev/null
+++ b/mcp/reclass/classes/cluster/mcp-fdio-ha/openstack/init.yml
@@ -0,0 +1,13 @@
+##############################################################################
+# Copyright (c) 2018 Mirantis Inc., Enea AB and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Apache License, Version 2.0
+# which accompanies this distribution, and is available at
+# http://www.apache.org/licenses/LICENSE-2.0
+##############################################################################
+---
+classes:
+ - cluster.mcp-common-ha.openstack_init
+parameters:
+ _param:
+ neutron_tenant_network_types: "flat,vxlan"
diff --git a/mcp/reclass/classes/cluster/mcp-fdio-ha/openstack/message_queue.yml b/mcp/reclass/classes/cluster/mcp-fdio-ha/openstack/message_queue.yml
new file mode 100644
index 000000000..175215502
--- /dev/null
+++ b/mcp/reclass/classes/cluster/mcp-fdio-ha/openstack/message_queue.yml
@@ -0,0 +1,12 @@
+##############################################################################
+# Copyright (c) 2018 Mirantis Inc., Enea AB and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Apache License, Version 2.0
+# which accompanies this distribution, and is available at
+# http://www.apache.org/licenses/LICENSE-2.0
+##############################################################################
+---
+classes:
+ - cluster.mcp-common-ha.openstack_interface_vcp_biport
+ - cluster.mcp-common-ha.openstack_message_queue
+ - cluster.mcp-fdio-ha.infra.init_vcp
diff --git a/mcp/reclass/classes/cluster/mcp-fdio-ha/openstack/proxy.yml b/mcp/reclass/classes/cluster/mcp-fdio-ha/openstack/proxy.yml
new file mode 100644
index 000000000..bafbbaa6a
--- /dev/null
+++ b/mcp/reclass/classes/cluster/mcp-fdio-ha/openstack/proxy.yml
@@ -0,0 +1,12 @@
+##############################################################################
+# Copyright (c) 2018 Mirantis Inc., Enea AB and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Apache License, Version 2.0
+# which accompanies this distribution, and is available at
+# http://www.apache.org/licenses/LICENSE-2.0
+##############################################################################
+---
+classes:
+ - cluster.mcp-common-ha.openstack_interface_vcp_triport
+ - cluster.mcp-common-ha.openstack_proxy
+ - cluster.mcp-fdio-ha.infra.init_vcp
diff --git a/mcp/reclass/classes/cluster/mcp-fdio-ha/openstack/telemetry.yml b/mcp/reclass/classes/cluster/mcp-fdio-ha/openstack/telemetry.yml
new file mode 100644
index 000000000..9cb8fcd5e
--- /dev/null
+++ b/mcp/reclass/classes/cluster/mcp-fdio-ha/openstack/telemetry.yml
@@ -0,0 +1,12 @@
+##############################################################################
+# Copyright (c) 2018 Mirantis Inc., Enea AB and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Apache License, Version 2.0
+# which accompanies this distribution, and is available at
+# http://www.apache.org/licenses/LICENSE-2.0
+##############################################################################
+---
+classes:
+ - cluster.mcp-common-ha.openstack_interface_vcp_biport
+ - cluster.mcp-common-ha.openstack_telemetry
+ - cluster.mcp-fdio-ha.infra.init_vcp
diff --git a/mcp/reclass/classes/cluster/mcp-fdio-noha/infra/config.yml b/mcp/reclass/classes/cluster/mcp-fdio-noha/infra/config.yml
new file mode 100644
index 000000000..6627ae6fe
--- /dev/null
+++ b/mcp/reclass/classes/cluster/mcp-fdio-noha/infra/config.yml
@@ -0,0 +1,22 @@
+##############################################################################
+# Copyright (c) 2018 Mirantis Inc., Enea AB and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Apache License, Version 2.0
+# which accompanies this distribution, and is available at
+# http://www.apache.org/licenses/LICENSE-2.0
+##############################################################################
+---
+classes:
+ - system.reclass.storage.system.openstack_gateway_single
+ - cluster.mcp-common-noha.infra.config
+ - cluster.mcp-fdio-noha
+ - cluster.all-mcp-arch-common.infra.config_pdf
+parameters:
+ reclass:
+ storage:
+ node:
+ openstack_gateway_node01:
+ params:
+ tenant_address: ${_param:opnfv_openstack_gateway_node01_tenant_address}
+ external_address: ${_param:opnfv_openstack_gateway_node01_external_address}
+ pxe_admin_address: ${_param:opnfv_openstack_gateway_node01_pxe_admin_address}
diff --git a/mcp/reclass/classes/cluster/mcp-fdio-noha/infra/init.yml b/mcp/reclass/classes/cluster/mcp-fdio-noha/infra/init.yml
new file mode 100644
index 000000000..b1d890dfb
--- /dev/null
+++ b/mcp/reclass/classes/cluster/mcp-fdio-noha/infra/init.yml
@@ -0,0 +1,14 @@
+##############################################################################
+# Copyright (c) 2018 Mirantis Inc., Enea AB and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Apache License, Version 2.0
+# which accompanies this distribution, and is available at
+# http://www.apache.org/licenses/LICENSE-2.0
+##############################################################################
+---
+classes:
+ - cluster.mcp-common-noha.infra
+
+parameters:
+ _param:
+ cluster_name: mcp-fdio-noha
diff --git a/mcp/reclass/classes/cluster/mcp-fdio-noha/infra/maas.yml b/mcp/reclass/classes/cluster/mcp-fdio-noha/infra/maas.yml
new file mode 100644
index 000000000..3520cc303
--- /dev/null
+++ b/mcp/reclass/classes/cluster/mcp-fdio-noha/infra/maas.yml
@@ -0,0 +1,11 @@
+##############################################################################
+# Copyright (c) 2018 Mirantis Inc., Enea AB and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Apache License, Version 2.0
+# which accompanies this distribution, and is available at
+# http://www.apache.org/licenses/LICENSE-2.0
+##############################################################################
+---
+classes:
+ - cluster.all-mcp-arch-common.infra.maas
+ - cluster.mcp-fdio-noha.infra
diff --git a/mcp/reclass/classes/cluster/mcp-fdio-noha/init.yml b/mcp/reclass/classes/cluster/mcp-fdio-noha/init.yml
new file mode 100644
index 000000000..6e4f952fd
--- /dev/null
+++ b/mcp/reclass/classes/cluster/mcp-fdio-noha/init.yml
@@ -0,0 +1,12 @@
+##############################################################################
+# Copyright (c) 2018 Mirantis Inc., Enea AB and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Apache License, Version 2.0
+# which accompanies this distribution, and is available at
+# http://www.apache.org/licenses/LICENSE-2.0
+##############################################################################
+---
+classes:
+ - cluster.mcp-common-noha.init_options
+ - cluster.mcp-fdio-noha.infra
+ - cluster.mcp-fdio-noha.openstack
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
new file mode 100644
index 000000000..2f1b8c39e
--- /dev/null
+++ b/mcp/reclass/classes/cluster/mcp-fdio-noha/openstack/compute.yml.j2
@@ -0,0 +1,32 @@
+##############################################################################
+# Copyright (c) 2018 Mirantis Inc., Enea AB and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Apache License, Version 2.0
+# which accompanies this distribution, and is available at
+# http://www.apache.org/licenses/LICENSE-2.0
+##############################################################################
+{%- import 'net_map.j2' as nm with context %}
+{%- import 'net_macros.j2' as ma with context %}
+{%- set vlan_private_start = (nm.vlan_private | string).rsplit('-')[0] %}
+---
+classes:
+ - service.neutron.compute.single
+ - cluster.mcp-common-noha.openstack_compute
+ - cluster.mcp-fdio-noha
+parameters:
+ linux:
+ network:
+ interface:
+ pxe_admin_int:
+ # For scenarios without public network on cmp, set admin gw
+ gateway: {{ nm.net_admin_gw }}
+ name_servers:
+ - {{ nm.net_admin_gw }}
+ br-mesh:
+ enabled: true
+ type: bridge
+ proto: static
+ address: ${_param:tenant_address}
+ netmask: ${_param:opnfv_net_private_mask}
+ use_interfaces:
+ - {{ ma.interface_str(nm.cmp001.nic_private, vlan_private_start) }}
diff --git a/mcp/reclass/classes/cluster/mcp-fdio-noha/openstack/control.yml b/mcp/reclass/classes/cluster/mcp-fdio-noha/openstack/control.yml
new file mode 100644
index 000000000..3c2cdefaa
--- /dev/null
+++ b/mcp/reclass/classes/cluster/mcp-fdio-noha/openstack/control.yml
@@ -0,0 +1,12 @@
+##############################################################################
+# Copyright (c) 2018 Mirantis Inc., Enea AB and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Apache License, Version 2.0
+# which accompanies this distribution, and is available at
+# http://www.apache.org/licenses/LICENSE-2.0
+##############################################################################
+---
+classes:
+ - system.neutron.control.openvswitch.single
+ - cluster.mcp-common-noha.openstack_control
+ - cluster.mcp-fdio-noha
diff --git a/mcp/reclass/classes/cluster/mcp-fdio-noha/openstack/gateway.yml.j2 b/mcp/reclass/classes/cluster/mcp-fdio-noha/openstack/gateway.yml.j2
new file mode 100644
index 000000000..1b2ecb04b
--- /dev/null
+++ b/mcp/reclass/classes/cluster/mcp-fdio-noha/openstack/gateway.yml.j2
@@ -0,0 +1,28 @@
+##############################################################################
+# Copyright (c) 2018 Mirantis Inc., Enea AB and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Apache License, Version 2.0
+# which accompanies this distribution, and is available at
+# http://www.apache.org/licenses/LICENSE-2.0
+##############################################################################
+{%- import 'net_map.j2' as nm with context %}
+{%- import 'net_macros.j2' as ma with context %}
+{%- set vlan_private_start = (nm.vlan_private | string).rsplit('-')[0] %}
+---
+classes:
+ - cluster.mcp-common-noha.openstack_gateway
+ - service.neutron.gateway.single
+ - cluster.mcp-fdio-noha
+parameters:
+ linux:
+ network:
+ interface:
+ br-mesh:
+ enabled: true
+ type: bridge
+ mtu: ${_param:interface_mtu}
+ proto: static
+ address: ${_param:tenant_address}
+ netmask: ${_param:opnfv_net_private_mask}
+ use_interfaces:
+ - {{ ma.interface_str(nm.ctl01.nic_private, vlan_private_start) }}
diff --git a/mcp/reclass/classes/cluster/mcp-fdio-noha/openstack/init.yml b/mcp/reclass/classes/cluster/mcp-fdio-noha/openstack/init.yml
new file mode 100644
index 000000000..79e231825
--- /dev/null
+++ b/mcp/reclass/classes/cluster/mcp-fdio-noha/openstack/init.yml
@@ -0,0 +1,13 @@
+##############################################################################
+# Copyright (c) 2018 Mirantis Inc., Enea AB and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Apache License, Version 2.0
+# which accompanies this distribution, and is available at
+# http://www.apache.org/licenses/LICENSE-2.0
+##############################################################################
+---
+classes:
+ - cluster.mcp-common-noha.openstack_init
+parameters:
+ _param:
+ neutron_tenant_network_types: "flat,vxlan"
diff --git a/mcp/reclass/classes/cluster/mcp-vpp-ha/infra/config.yml b/mcp/reclass/classes/cluster/mcp-vpp-ha/infra/config.yml
deleted file mode 100644
index 06347bf22..000000000
--- a/mcp/reclass/classes/cluster/mcp-vpp-ha/infra/config.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-##############################################################################
-# Copyright (c) 2018 Mirantis Inc., Enea AB and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Apache License, Version 2.0
-# which accompanies this distribution, and is available at
-# http://www.apache.org/licenses/LICENSE-2.0
-##############################################################################
----
-classes:
- - cluster.mcp-common-ha.infra.config
- - cluster.mcp-vpp-ha.infra
- - cluster.all-mcp-arch-common.infra.config_pdf
diff --git a/mcp/reclass/classes/cluster/mcp-vpp-ha/infra/init.yml b/mcp/reclass/classes/cluster/mcp-vpp-ha/infra/init.yml
deleted file mode 100644
index a434ef7c1..000000000
--- a/mcp/reclass/classes/cluster/mcp-vpp-ha/infra/init.yml
+++ /dev/null
@@ -1,14 +0,0 @@
-##############################################################################
-# Copyright (c) 2018 Mirantis Inc., Enea AB and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Apache License, Version 2.0
-# which accompanies this distribution, and is available at
-# http://www.apache.org/licenses/LICENSE-2.0
-##############################################################################
----
-classes:
- - cluster.mcp-common-ha.infra
- - cluster.mcp-vpp-ha.openstack
-parameters:
- _param:
- cluster_name: mcp-vpp-ha
diff --git a/mcp/reclass/classes/cluster/mcp-vpp-ha/infra/init_vcp.yml.j2 b/mcp/reclass/classes/cluster/mcp-vpp-ha/infra/init_vcp.yml.j2
deleted file mode 100644
index 21d2e42ce..000000000
--- a/mcp/reclass/classes/cluster/mcp-vpp-ha/infra/init_vcp.yml.j2
+++ /dev/null
@@ -1,12 +0,0 @@
-##############################################################################
-# Copyright (c) 2018 Mirantis Inc., Enea AB and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Apache License, Version 2.0
-# which accompanies this distribution, and is available at
-# http://www.apache.org/licenses/LICENSE-2.0
-##############################################################################
----
-{%- if conf.MCP_VCP %}
-classes:
- - cluster.mcp-vpp-ha.infra
-{%- endif %}
diff --git a/mcp/reclass/classes/cluster/mcp-vpp-ha/infra/kvm.yml.j2 b/mcp/reclass/classes/cluster/mcp-vpp-ha/infra/kvm.yml.j2
deleted file mode 100644
index 2f72c4178..000000000
--- a/mcp/reclass/classes/cluster/mcp-vpp-ha/infra/kvm.yml.j2
+++ /dev/null
@@ -1,14 +0,0 @@
-##############################################################################
-# Copyright (c) 2018 Mirantis Inc., Enea AB and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Apache License, Version 2.0
-# which accompanies this distribution, and is available at
-# http://www.apache.org/licenses/LICENSE-2.0
-##############################################################################
----
-{%- if conf.MCP_VCP %}
-# NOTE(armband): we don't want to pull in salt.control for novcp
-classes:
- - cluster.mcp-common-ha.infra.kvm
- - cluster.mcp-vpp-ha.infra
-{%- endif %}
diff --git a/mcp/reclass/classes/cluster/mcp-vpp-ha/infra/maas.yml b/mcp/reclass/classes/cluster/mcp-vpp-ha/infra/maas.yml
deleted file mode 100644
index b2b66992c..000000000
--- a/mcp/reclass/classes/cluster/mcp-vpp-ha/infra/maas.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-##############################################################################
-# Copyright (c) 2018 Mirantis Inc., Enea AB and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Apache License, Version 2.0
-# which accompanies this distribution, and is available at
-# http://www.apache.org/licenses/LICENSE-2.0
-##############################################################################
----
-classes:
- - cluster.all-mcp-arch-common.infra.maas
- - cluster.mcp-vpp-ha.infra
diff --git a/mcp/reclass/classes/cluster/mcp-vpp-ha/init.yml b/mcp/reclass/classes/cluster/mcp-vpp-ha/init.yml
deleted file mode 100644
index dc6b8bfef..000000000
--- a/mcp/reclass/classes/cluster/mcp-vpp-ha/init.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-##############################################################################
-# Copyright (c) 2018 Mirantis Inc., Enea AB and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Apache License, Version 2.0
-# which accompanies this distribution, and is available at
-# http://www.apache.org/licenses/LICENSE-2.0
-##############################################################################
----
-classes:
- - cluster.all-mcp-arch-common
- - cluster.mcp-vpp-ha.infra
- - cluster.mcp-vpp-ha.openstack
diff --git a/mcp/reclass/classes/cluster/mcp-vpp-ha/openstack/compute.yml b/mcp/reclass/classes/cluster/mcp-vpp-ha/openstack/compute.yml
deleted file mode 100644
index 0518a8b57..000000000
--- a/mcp/reclass/classes/cluster/mcp-vpp-ha/openstack/compute.yml
+++ /dev/null
@@ -1,17 +0,0 @@
-##############################################################################
-# Copyright (c) 2018 Mirantis Inc., Enea AB and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Apache License, Version 2.0
-# which accompanies this distribution, and is available at
-# http://www.apache.org/licenses/LICENSE-2.0
-##############################################################################
----
-classes:
- - cluster.mcp-common-ha.openstack_compute
- - cluster.mcp-vpp-ha.openstack.compute_pdf
- - cluster.mcp-vpp-ha.infra
-parameters:
- nova:
- compute:
- libvirt_service: libvirtd
- libvirt_bin: /etc/default/libvirtd
diff --git a/mcp/reclass/classes/cluster/mcp-vpp-ha/openstack/compute_pdf.yml.j2 b/mcp/reclass/classes/cluster/mcp-vpp-ha/openstack/compute_pdf.yml.j2
deleted file mode 100644
index f3844ad8c..000000000
--- a/mcp/reclass/classes/cluster/mcp-vpp-ha/openstack/compute_pdf.yml.j2
+++ /dev/null
@@ -1,36 +0,0 @@
-##############################################################################
-# Copyright (c) 2018 Mirantis Inc., Enea AB and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Apache License, Version 2.0
-# which accompanies this distribution, and is available at
-# http://www.apache.org/licenses/LICENSE-2.0
-##############################################################################
-{%- import 'net_map.j2' as nm with context %}
-{%- import 'net_macros.j2' as ma with context %}
-{#- Filter-out NIC duplicates by constructing a dict (used NICs only) #}
-{%- set nics = { nm.cmp001.nic_private: True } %}
-{%- set vlan_private_start = (nm.vlan_private | string).rsplit('-')[0] %}
-{%- set vlans = { vlan_private_start: nm.cmp001.nic_private } %}
----
-parameters:
- linux:
- network:
- interface:
-
-{#- prevent duplicates for tagged mgmt on the same physical interface as PXE/admin #}
-{%- if nm.cmp001.nic_admin in nics %}
- {%- do nics.pop(nm.cmp001.nic_admin) %}
-{%- endif %}
-
-{{ ma.linux_network_interfaces_nic(nics) }}
-
-{{ ma.linux_network_interfaces_vlan(vlans) }}
-
- br-mesh:
- enabled: true
- type: bridge
- address: ${_param:tenant_address}
- netmask: ${_param:opnfv_net_private_mask}
- mtu: 1500
- use_interfaces:
- - {{ ma.interface_str(nm.cmp001.nic_private, vlan_private_start) }}
diff --git a/mcp/reclass/classes/cluster/mcp-vpp-ha/openstack/control.yml b/mcp/reclass/classes/cluster/mcp-vpp-ha/openstack/control.yml
deleted file mode 100644
index 9bca1f084..000000000
--- a/mcp/reclass/classes/cluster/mcp-vpp-ha/openstack/control.yml
+++ /dev/null
@@ -1,13 +0,0 @@
-##############################################################################
-# Copyright (c) 2018 Mirantis Inc., Enea AB and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Apache License, Version 2.0
-# which accompanies this distribution, and is available at
-# http://www.apache.org/licenses/LICENSE-2.0
-##############################################################################
----
-classes:
- - system.neutron.control.openvswitch.cluster
- - cluster.mcp-common-ha.openstack_interface_vcp_biport
- - cluster.mcp-common-ha.openstack_control
- - cluster.mcp-vpp-ha.infra
diff --git a/mcp/reclass/classes/cluster/mcp-vpp-ha/openstack/database.yml b/mcp/reclass/classes/cluster/mcp-vpp-ha/openstack/database.yml
deleted file mode 100644
index a75fa675b..000000000
--- a/mcp/reclass/classes/cluster/mcp-vpp-ha/openstack/database.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-##############################################################################
-# Copyright (c) 2018 Mirantis Inc., Enea AB and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Apache License, Version 2.0
-# which accompanies this distribution, and is available at
-# http://www.apache.org/licenses/LICENSE-2.0
-##############################################################################
----
-classes:
- - cluster.mcp-common-ha.openstack_interface_vcp_biport
- - cluster.mcp-common-ha.openstack_database
- - cluster.mcp-vpp-ha.infra.init_vcp
diff --git a/mcp/reclass/classes/cluster/mcp-vpp-ha/openstack/init.yml b/mcp/reclass/classes/cluster/mcp-vpp-ha/openstack/init.yml
deleted file mode 100644
index 9dbfd59a1..000000000
--- a/mcp/reclass/classes/cluster/mcp-vpp-ha/openstack/init.yml
+++ /dev/null
@@ -1,13 +0,0 @@
-##############################################################################
-# Copyright (c) 2018 Mirantis Inc., Enea AB and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Apache License, Version 2.0
-# which accompanies this distribution, and is available at
-# http://www.apache.org/licenses/LICENSE-2.0
-##############################################################################
----
-classes:
- - cluster.mcp-common-ha.openstack_init
-parameters:
- _param:
- neutron_tenant_network_types: "flat,vxlan"
diff --git a/mcp/reclass/classes/cluster/mcp-vpp-ha/openstack/message_queue.yml b/mcp/reclass/classes/cluster/mcp-vpp-ha/openstack/message_queue.yml
deleted file mode 100644
index 42a1b658e..000000000
--- a/mcp/reclass/classes/cluster/mcp-vpp-ha/openstack/message_queue.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-##############################################################################
-# Copyright (c) 2018 Mirantis Inc., Enea AB and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Apache License, Version 2.0
-# which accompanies this distribution, and is available at
-# http://www.apache.org/licenses/LICENSE-2.0
-##############################################################################
----
-classes:
- - cluster.mcp-common-ha.openstack_interface_vcp_biport
- - cluster.mcp-common-ha.openstack_message_queue
- - cluster.mcp-vpp-ha.infra.init_vcp
diff --git a/mcp/reclass/classes/cluster/mcp-vpp-ha/openstack/proxy.yml b/mcp/reclass/classes/cluster/mcp-vpp-ha/openstack/proxy.yml
deleted file mode 100644
index 3a82e51a6..000000000
--- a/mcp/reclass/classes/cluster/mcp-vpp-ha/openstack/proxy.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-##############################################################################
-# Copyright (c) 2018 Mirantis Inc., Enea AB and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Apache License, Version 2.0
-# which accompanies this distribution, and is available at
-# http://www.apache.org/licenses/LICENSE-2.0
-##############################################################################
----
-classes:
- - cluster.mcp-common-ha.openstack_interface_vcp_triport
- - cluster.mcp-common-ha.openstack_proxy
- - cluster.mcp-vpp-ha.infra.init_vcp
diff --git a/mcp/reclass/classes/cluster/mcp-vpp-ha/openstack/telemetry.yml b/mcp/reclass/classes/cluster/mcp-vpp-ha/openstack/telemetry.yml
deleted file mode 100644
index 402616868..000000000
--- a/mcp/reclass/classes/cluster/mcp-vpp-ha/openstack/telemetry.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-##############################################################################
-# Copyright (c) 2018 Mirantis Inc., Enea AB and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Apache License, Version 2.0
-# which accompanies this distribution, and is available at
-# http://www.apache.org/licenses/LICENSE-2.0
-##############################################################################
----
-classes:
- - cluster.mcp-common-ha.openstack_interface_vcp_biport
- - cluster.mcp-common-ha.openstack_telemetry
- - cluster.mcp-vpp-ha.infra.init_vcp
diff --git a/mcp/reclass/classes/cluster/mcp-vpp-noha/infra/config.yml b/mcp/reclass/classes/cluster/mcp-vpp-noha/infra/config.yml
deleted file mode 100644
index 0263a57d0..000000000
--- a/mcp/reclass/classes/cluster/mcp-vpp-noha/infra/config.yml
+++ /dev/null
@@ -1,22 +0,0 @@
-##############################################################################
-# Copyright (c) 2018 Mirantis Inc., Enea AB and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Apache License, Version 2.0
-# which accompanies this distribution, and is available at
-# http://www.apache.org/licenses/LICENSE-2.0
-##############################################################################
----
-classes:
- - system.reclass.storage.system.openstack_gateway_single
- - cluster.mcp-common-noha.infra.config
- - cluster.mcp-vpp-noha
- - cluster.all-mcp-arch-common.infra.config_pdf
-parameters:
- reclass:
- storage:
- node:
- openstack_gateway_node01:
- params:
- tenant_address: ${_param:opnfv_openstack_gateway_node01_tenant_address}
- external_address: ${_param:opnfv_openstack_gateway_node01_external_address}
- pxe_admin_address: ${_param:opnfv_openstack_gateway_node01_pxe_admin_address}
diff --git a/mcp/reclass/classes/cluster/mcp-vpp-noha/infra/init.yml b/mcp/reclass/classes/cluster/mcp-vpp-noha/infra/init.yml
deleted file mode 100644
index f61519664..000000000
--- a/mcp/reclass/classes/cluster/mcp-vpp-noha/infra/init.yml
+++ /dev/null
@@ -1,14 +0,0 @@
-##############################################################################
-# Copyright (c) 2018 Mirantis Inc., Enea AB and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Apache License, Version 2.0
-# which accompanies this distribution, and is available at
-# http://www.apache.org/licenses/LICENSE-2.0
-##############################################################################
----
-classes:
- - cluster.mcp-common-noha.infra
-
-parameters:
- _param:
- cluster_name: mcp-vpp-noha
diff --git a/mcp/reclass/classes/cluster/mcp-vpp-noha/infra/maas.yml b/mcp/reclass/classes/cluster/mcp-vpp-noha/infra/maas.yml
deleted file mode 100644
index e02d0304f..000000000
--- a/mcp/reclass/classes/cluster/mcp-vpp-noha/infra/maas.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-##############################################################################
-# Copyright (c) 2018 Mirantis Inc., Enea AB and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Apache License, Version 2.0
-# which accompanies this distribution, and is available at
-# http://www.apache.org/licenses/LICENSE-2.0
-##############################################################################
----
-classes:
- - cluster.all-mcp-arch-common.infra.maas
- - cluster.mcp-vpp-noha.infra
diff --git a/mcp/reclass/classes/cluster/mcp-vpp-noha/init.yml b/mcp/reclass/classes/cluster/mcp-vpp-noha/init.yml
deleted file mode 100644
index 41515cf6d..000000000
--- a/mcp/reclass/classes/cluster/mcp-vpp-noha/init.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-##############################################################################
-# Copyright (c) 2018 Mirantis Inc., Enea AB and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Apache License, Version 2.0
-# which accompanies this distribution, and is available at
-# http://www.apache.org/licenses/LICENSE-2.0
-##############################################################################
----
-classes:
- - cluster.mcp-common-noha.init_options
- - cluster.mcp-vpp-noha.infra
- - cluster.mcp-vpp-noha.openstack
diff --git a/mcp/reclass/classes/cluster/mcp-vpp-noha/openstack/compute.yml.j2 b/mcp/reclass/classes/cluster/mcp-vpp-noha/openstack/compute.yml.j2
deleted file mode 100644
index 9142743da..000000000
--- a/mcp/reclass/classes/cluster/mcp-vpp-noha/openstack/compute.yml.j2
+++ /dev/null
@@ -1,32 +0,0 @@
-##############################################################################
-# Copyright (c) 2018 Mirantis Inc., Enea AB and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Apache License, Version 2.0
-# which accompanies this distribution, and is available at
-# http://www.apache.org/licenses/LICENSE-2.0
-##############################################################################
-{%- import 'net_map.j2' as nm with context %}
-{%- import 'net_macros.j2' as ma with context %}
-{%- set vlan_private_start = (nm.vlan_private | string).rsplit('-')[0] %}
----
-classes:
- - service.neutron.compute.single
- - cluster.mcp-common-noha.openstack_compute
- - cluster.mcp-vpp-noha
-parameters:
- linux:
- network:
- interface:
- pxe_admin_int:
- # For scenarios without public network on cmp, set admin gw
- gateway: {{ nm.net_admin_gw }}
- name_servers:
- - {{ nm.net_admin_gw }}
- br-mesh:
- enabled: true
- type: bridge
- proto: static
- address: ${_param:tenant_address}
- netmask: ${_param:opnfv_net_private_mask}
- use_interfaces:
- - {{ ma.interface_str(nm.cmp001.nic_private, vlan_private_start) }}
diff --git a/mcp/reclass/classes/cluster/mcp-vpp-noha/openstack/control.yml b/mcp/reclass/classes/cluster/mcp-vpp-noha/openstack/control.yml
deleted file mode 100644
index 49dc3da4a..000000000
--- a/mcp/reclass/classes/cluster/mcp-vpp-noha/openstack/control.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-##############################################################################
-# Copyright (c) 2018 Mirantis Inc., Enea AB and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Apache License, Version 2.0
-# which accompanies this distribution, and is available at
-# http://www.apache.org/licenses/LICENSE-2.0
-##############################################################################
----
-classes:
- - system.neutron.control.openvswitch.single
- - cluster.mcp-common-noha.openstack_control
- - cluster.mcp-vpp-noha
diff --git a/mcp/reclass/classes/cluster/mcp-vpp-noha/openstack/gateway.yml.j2 b/mcp/reclass/classes/cluster/mcp-vpp-noha/openstack/gateway.yml.j2
deleted file mode 100644
index 27e6372b0..000000000
--- a/mcp/reclass/classes/cluster/mcp-vpp-noha/openstack/gateway.yml.j2
+++ /dev/null
@@ -1,28 +0,0 @@
-##############################################################################
-# Copyright (c) 2018 Mirantis Inc., Enea AB and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Apache License, Version 2.0
-# which accompanies this distribution, and is available at
-# http://www.apache.org/licenses/LICENSE-2.0
-##############################################################################
-{%- import 'net_map.j2' as nm with context %}
-{%- import 'net_macros.j2' as ma with context %}
-{%- set vlan_private_start = (nm.vlan_private | string).rsplit('-')[0] %}
----
-classes:
- - cluster.mcp-common-noha.openstack_gateway
- - service.neutron.gateway.single
- - cluster.mcp-vpp-noha
-parameters:
- linux:
- network:
- interface:
- br-mesh:
- enabled: true
- type: bridge
- mtu: ${_param:interface_mtu}
- proto: static
- address: ${_param:tenant_address}
- netmask: ${_param:opnfv_net_private_mask}
- use_interfaces:
- - {{ ma.interface_str(nm.ctl01.nic_private, vlan_private_start) }}
diff --git a/mcp/reclass/classes/cluster/mcp-vpp-noha/openstack/init.yml b/mcp/reclass/classes/cluster/mcp-vpp-noha/openstack/init.yml
deleted file mode 100644
index 79e231825..000000000
--- a/mcp/reclass/classes/cluster/mcp-vpp-noha/openstack/init.yml
+++ /dev/null
@@ -1,13 +0,0 @@
-##############################################################################
-# Copyright (c) 2018 Mirantis Inc., Enea AB and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Apache License, Version 2.0
-# which accompanies this distribution, and is available at
-# http://www.apache.org/licenses/LICENSE-2.0
-##############################################################################
----
-classes:
- - cluster.mcp-common-noha.openstack_init
-parameters:
- _param:
- neutron_tenant_network_types: "flat,vxlan"
diff --git a/mcp/reclass/nodes/cfg01.mcp-fdio-ha.local.yml b/mcp/reclass/nodes/cfg01.mcp-fdio-ha.local.yml
new file mode 100644
index 000000000..defa03158
--- /dev/null
+++ b/mcp/reclass/nodes/cfg01.mcp-fdio-ha.local.yml
@@ -0,0 +1,18 @@
+##############################################################################
+# Copyright (c) 2018 Mirantis Inc., Enea AB and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Apache License, Version 2.0
+# which accompanies this distribution, and is available at
+# http://www.apache.org/licenses/LICENSE-2.0
+##############################################################################
+---
+classes:
+ - cluster.mcp-fdio-ha.infra.config
+parameters:
+ _param:
+ linux_system_codename: xenial
+ reclass_data_revision: master
+ linux:
+ system:
+ name: cfg01
+ domain: mcp-fdio-ha.local
diff --git a/mcp/reclass/nodes/cfg01.mcp-fdio-noha.local.yml b/mcp/reclass/nodes/cfg01.mcp-fdio-noha.local.yml
new file mode 100644
index 000000000..9a7ac1476
--- /dev/null
+++ b/mcp/reclass/nodes/cfg01.mcp-fdio-noha.local.yml
@@ -0,0 +1,18 @@
+##############################################################################
+# Copyright (c) 2017 Mirantis Inc., Enea AB and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Apache License, Version 2.0
+# which accompanies this distribution, and is available at
+# http://www.apache.org/licenses/LICENSE-2.0
+##############################################################################
+---
+classes:
+ - cluster.mcp-fdio-noha.infra.config
+parameters:
+ _param:
+ linux_system_codename: xenial
+ reclass_data_revision: master
+ linux:
+ system:
+ name: cfg01
+ domain: mcp-fdio-noha.local
diff --git a/mcp/reclass/nodes/cfg01.mcp-vpp-ha.local.yml b/mcp/reclass/nodes/cfg01.mcp-vpp-ha.local.yml
deleted file mode 100644
index 89bb3c3ca..000000000
--- a/mcp/reclass/nodes/cfg01.mcp-vpp-ha.local.yml
+++ /dev/null
@@ -1,18 +0,0 @@
-##############################################################################
-# Copyright (c) 2018 Mirantis Inc., Enea AB and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Apache License, Version 2.0
-# which accompanies this distribution, and is available at
-# http://www.apache.org/licenses/LICENSE-2.0
-##############################################################################
----
-classes:
- - cluster.mcp-vpp-ha.infra.config
-parameters:
- _param:
- linux_system_codename: xenial
- reclass_data_revision: master
- linux:
- system:
- name: cfg01
- domain: mcp-vpp-ha.local
diff --git a/mcp/reclass/nodes/cfg01.mcp-vpp-noha.local.yml b/mcp/reclass/nodes/cfg01.mcp-vpp-noha.local.yml
deleted file mode 100644
index 381243168..000000000
--- a/mcp/reclass/nodes/cfg01.mcp-vpp-noha.local.yml
+++ /dev/null
@@ -1,18 +0,0 @@
-##############################################################################
-# Copyright (c) 2017 Mirantis Inc., Enea AB and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Apache License, Version 2.0
-# which accompanies this distribution, and is available at
-# http://www.apache.org/licenses/LICENSE-2.0
-##############################################################################
----
-classes:
- - cluster.mcp-vpp-noha.infra.config
-parameters:
- _param:
- linux_system_codename: xenial
- reclass_data_revision: master
- linux:
- system:
- name: cfg01
- domain: mcp-vpp-noha.local
--
cgit