38 files changed, 74 insertions, 68 deletions
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-vpp-ha/index.rst b/docs/release/scenarios/os-nosdn-fdio-ha/index.rst
index d4d5a46ef..5f14536ac 100644
--- a/docs/release/scenarios/os-nosdn-vpp-ha/index.rst
+++ b/docs/release/scenarios/os-nosdn-fdio-ha/index.rst
@@ -1,14 +1,14 @@
-.. _os-nosdn-vpp-ha:
+.. _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-vpp-ha overview and description
-========================================
+=========================================
+os-nosdn-fdio-ha overview and description
+=========================================
 
 .. toctree::
    :maxdepth: 2
 
-.. include:: os-nosdn-vpp-ha.rst
+.. include:: os-nosdn-fdio-ha.rst
diff --git a/docs/release/scenarios/os-nosdn-vpp-ha/os-nosdn-vpp-ha.rst b/docs/release/scenarios/os-nosdn-fdio-ha/os-nosdn-fdio-ha.rst
index 80c829acc..96c266996 100644
--- a/docs/release/scenarios/os-nosdn-vpp-ha/os-nosdn-vpp-ha.rst
+++ b/docs/release/scenarios/os-nosdn-fdio-ha/os-nosdn-fdio-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 VPP enabled as virtual switch.
 
 Introduction
@@ -26,7 +26,7 @@ per service.
 Scenario usage overview
 =======================
 
-Simply deploy this scenario by setting os-nosdn-vpp-ha as scenario
+Simply deploy this scenario by setting os-nosdn-fdio-ha as scenario
 deploy parameter.
 
 Limitations, Issues and Workarounds
diff --git a/docs/release/scenarios/os-nosdn-vpp-noha/index.rst b/docs/release/scenarios/os-nosdn-fdio-noha/index.rst
index 35059859d..e64d9607e 100644
--- a/docs/release/scenarios/os-nosdn-vpp-noha/index.rst
+++ b/docs/release/scenarios/os-nosdn-fdio-noha/index.rst
@@ -1,14 +1,14 @@
-.. _os-nosdn-vpp-noha:
+.. _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-vpp-noha overview and description
-==========================================
+===========================================
+os-nosdn-fdio-noha overview and description
+===========================================
 
 .. toctree::
    :maxdepth: 2
 
-.. include:: os-nosdn-vpp-noha.rst
+.. include:: os-nosdn-fdio-noha.rst
diff --git a/docs/release/scenarios/os-nosdn-vpp-noha/os-nosdn-vpp-noha.rst b/docs/release/scenarios/os-nosdn-fdio-noha/os-nosdn-fdio-noha.rst
index a699779ba..542ec3afa 100644
--- a/docs/release/scenarios/os-nosdn-vpp-noha/os-nosdn-vpp-noha.rst
+++ b/docs/release/scenarios/os-nosdn-fdio-noha/os-nosdn-fdio-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 VPP enabled as virtual switch.
 
 Introduction
@@ -23,7 +23,7 @@ VPP on the compute nodes as virtual switch.
 Scenario usage overview
 =======================
 
-Simply deploy this scenario by setting os-nosdn-vpp-noha as scenario
+Simply deploy this scenario by setting os-nosdn-fdio-noha as scenario
 deploy parameter.
 
 
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-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-vpp-ha.yaml b/mcp/config/scenario/os-nosdn-fdio-ha.yaml
index 9e7ebc1e2..3ff4e5c5d 100644
--- a/mcp/config/scenario/os-nosdn-vpp-ha.yaml
+++ b/mcp/config/scenario/os-nosdn-fdio-ha.yaml
@@ -7,7 +7,7 @@
 ##############################################################################
 ---
 cluster:
-  domain: mcp-vpp-ha.local
+  domain: mcp-fdio-ha.local
   states:
     - openstack_ha
     - networks
diff --git a/mcp/config/scenario/os-nosdn-vpp-noha.yaml b/mcp/config/scenario/os-nosdn-fdio-noha.yaml
index e90300407..b52a89cf4 100644
--- a/mcp/config/scenario/os-nosdn-vpp-noha.yaml
+++ b/mcp/config/scenario/os-nosdn-fdio-noha.yaml
@@ -7,7 +7,7 @@
 ##############################################################################
 ---
 cluster:
-  domain: mcp-vpp-noha.local
+  domain: mcp-fdio-noha.local
   states:
     - openstack_noha
     - neutron_gateway
diff --git a/mcp/reclass/classes/cluster/mcp-vpp-ha/infra/config.yml b/mcp/reclass/classes/cluster/mcp-fdio-ha/infra/config.yml
index 06347bf22..1bf5f0014 100644
--- a/mcp/reclass/classes/cluster/mcp-vpp-ha/infra/config.yml
+++ b/mcp/reclass/classes/cluster/mcp-fdio-ha/infra/config.yml
@@ -8,5 +8,5 @@
 ---
 classes:
   - cluster.mcp-common-ha.infra.config
-  - cluster.mcp-vpp-ha.infra
+  - cluster.mcp-fdio-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-fdio-ha/infra/init.yml
index a434ef7c1..3ab122e13 100644
--- a/mcp/reclass/classes/cluster/mcp-vpp-ha/infra/init.yml
+++ b/mcp/reclass/classes/cluster/mcp-fdio-ha/infra/init.yml
@@ -8,7 +8,7 @@
 ---
 classes:
   - cluster.mcp-common-ha.infra
-  - cluster.mcp-vpp-ha.openstack
+  - cluster.mcp-fdio-ha.openstack
 parameters:
   _param:
-    cluster_name: mcp-vpp-ha
+    cluster_name: mcp-fdio-ha
diff --git a/mcp/reclass/classes/cluster/mcp-vpp-ha/infra/init_vcp.yml.j2 b/mcp/reclass/classes/cluster/mcp-fdio-ha/infra/init_vcp.yml.j2
index 21d2e42ce..8ab411876 100644
--- a/mcp/reclass/classes/cluster/mcp-vpp-ha/infra/init_vcp.yml.j2
+++ b/mcp/reclass/classes/cluster/mcp-fdio-ha/infra/init_vcp.yml.j2
@@ -8,5 +8,5 @@
 ---
 {%- if conf.MCP_VCP %}
 classes:
-  - cluster.mcp-vpp-ha.infra
+  - cluster.mcp-fdio-ha.infra
 {%- endif %}
diff --git a/mcp/reclass/classes/cluster/mcp-vpp-ha/infra/kvm.yml.j2 b/mcp/reclass/classes/cluster/mcp-fdio-ha/infra/kvm.yml.j2
index 2f72c4178..dbbea5235 100644
--- a/mcp/reclass/classes/cluster/mcp-vpp-ha/infra/kvm.yml.j2
+++ b/mcp/reclass/classes/cluster/mcp-fdio-ha/infra/kvm.yml.j2
@@ -10,5 +10,5 @@
 # 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
+  - cluster.mcp-fdio-ha.infra
 {%- endif %}
diff --git a/mcp/reclass/classes/cluster/mcp-vpp-ha/infra/maas.yml b/mcp/reclass/classes/cluster/mcp-fdio-ha/infra/maas.yml
index b2b66992c..d39e259d1 100644
--- a/mcp/reclass/classes/cluster/mcp-vpp-ha/infra/maas.yml
+++ b/mcp/reclass/classes/cluster/mcp-fdio-ha/infra/maas.yml
@@ -8,4 +8,4 @@
 ---
 classes:
   - cluster.all-mcp-arch-common.infra.maas
-  - cluster.mcp-vpp-ha.infra
+  - cluster.mcp-fdio-ha.infra
diff --git a/mcp/reclass/classes/cluster/mcp-vpp-ha/init.yml b/mcp/reclass/classes/cluster/mcp-fdio-ha/init.yml
index dc6b8bfef..daeecfcc7 100644
--- a/mcp/reclass/classes/cluster/mcp-vpp-ha/init.yml
+++ b/mcp/reclass/classes/cluster/mcp-fdio-ha/init.yml
@@ -8,5 +8,5 @@
 ---
 classes:
   - cluster.all-mcp-arch-common
-  - cluster.mcp-vpp-ha.infra
-  - cluster.mcp-vpp-ha.openstack
+  - cluster.mcp-fdio-ha.infra
+  - cluster.mcp-fdio-ha.openstack
diff --git a/mcp/reclass/classes/cluster/mcp-vpp-ha/openstack/compute.yml b/mcp/reclass/classes/cluster/mcp-fdio-ha/openstack/compute.yml
index 0518a8b57..4b718abe7 100644
--- a/mcp/reclass/classes/cluster/mcp-vpp-ha/openstack/compute.yml
+++ b/mcp/reclass/classes/cluster/mcp-fdio-ha/openstack/compute.yml
@@ -8,8 +8,8 @@
 ---
 classes:
   - cluster.mcp-common-ha.openstack_compute
-  - cluster.mcp-vpp-ha.openstack.compute_pdf
-  - cluster.mcp-vpp-ha.infra
+  - cluster.mcp-fdio-ha.openstack.compute_pdf
+  - cluster.mcp-fdio-ha.infra
 parameters:
   nova:
     compute:
diff --git a/mcp/reclass/classes/cluster/mcp-vpp-ha/openstack/compute_pdf.yml.j2 b/mcp/reclass/classes/cluster/mcp-fdio-ha/openstack/compute_pdf.yml.j2
index f3844ad8c..f3844ad8c 100644
--- a/mcp/reclass/classes/cluster/mcp-vpp-ha/openstack/compute_pdf.yml.j2
+++ b/mcp/reclass/classes/cluster/mcp-fdio-ha/openstack/compute_pdf.yml.j2
diff --git a/mcp/reclass/classes/cluster/mcp-vpp-ha/openstack/control.yml b/mcp/reclass/classes/cluster/mcp-fdio-ha/openstack/control.yml
index 9bca1f084..a9bb44907 100644
--- a/mcp/reclass/classes/cluster/mcp-vpp-ha/openstack/control.yml
+++ b/mcp/reclass/classes/cluster/mcp-fdio-ha/openstack/control.yml
@@ -10,4 +10,4 @@ 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
+  - cluster.mcp-fdio-ha.infra
diff --git a/mcp/reclass/classes/cluster/mcp-vpp-ha/openstack/database.yml b/mcp/reclass/classes/cluster/mcp-fdio-ha/openstack/database.yml
index a75fa675b..7ba9e5660 100644
--- a/mcp/reclass/classes/cluster/mcp-vpp-ha/openstack/database.yml
+++ b/mcp/reclass/classes/cluster/mcp-fdio-ha/openstack/database.yml
@@ -9,4 +9,4 @@
 classes:
   - cluster.mcp-common-ha.openstack_interface_vcp_biport
   - cluster.mcp-common-ha.openstack_database
-  - cluster.mcp-vpp-ha.infra.init_vcp
+  - cluster.mcp-fdio-ha.infra.init_vcp
diff --git a/mcp/reclass/classes/cluster/mcp-vpp-ha/openstack/init.yml b/mcp/reclass/classes/cluster/mcp-fdio-ha/openstack/init.yml
index 9dbfd59a1..9dbfd59a1 100644
--- a/mcp/reclass/classes/cluster/mcp-vpp-ha/openstack/init.yml
+++ b/mcp/reclass/classes/cluster/mcp-fdio-ha/openstack/init.yml
diff --git a/mcp/reclass/classes/cluster/mcp-vpp-ha/openstack/message_queue.yml b/mcp/reclass/classes/cluster/mcp-fdio-ha/openstack/message_queue.yml
index 42a1b658e..175215502 100644
--- a/mcp/reclass/classes/cluster/mcp-vpp-ha/openstack/message_queue.yml
+++ b/mcp/reclass/classes/cluster/mcp-fdio-ha/openstack/message_queue.yml
@@ -9,4 +9,4 @@
 classes:
   - cluster.mcp-common-ha.openstack_interface_vcp_biport
   - cluster.mcp-common-ha.openstack_message_queue
-  - cluster.mcp-vpp-ha.infra.init_vcp
+  - cluster.mcp-fdio-ha.infra.init_vcp
diff --git a/mcp/reclass/classes/cluster/mcp-vpp-ha/openstack/proxy.yml b/mcp/reclass/classes/cluster/mcp-fdio-ha/openstack/proxy.yml
index 3a82e51a6..bafbbaa6a 100644
--- a/mcp/reclass/classes/cluster/mcp-vpp-ha/openstack/proxy.yml
+++ b/mcp/reclass/classes/cluster/mcp-fdio-ha/openstack/proxy.yml
@@ -9,4 +9,4 @@
 classes:
   - cluster.mcp-common-ha.openstack_interface_vcp_triport
   - cluster.mcp-common-ha.openstack_proxy
-  - cluster.mcp-vpp-ha.infra.init_vcp
+  - cluster.mcp-fdio-ha.infra.init_vcp
diff --git a/mcp/reclass/classes/cluster/mcp-vpp-ha/openstack/telemetry.yml b/mcp/reclass/classes/cluster/mcp-fdio-ha/openstack/telemetry.yml
index 402616868..9cb8fcd5e 100644
--- a/mcp/reclass/classes/cluster/mcp-vpp-ha/openstack/telemetry.yml
+++ b/mcp/reclass/classes/cluster/mcp-fdio-ha/openstack/telemetry.yml
@@ -9,4 +9,4 @@
 classes:
   - cluster.mcp-common-ha.openstack_interface_vcp_biport
   - cluster.mcp-common-ha.openstack_telemetry
-  - cluster.mcp-vpp-ha.infra.init_vcp
+  - cluster.mcp-fdio-ha.infra.init_vcp
diff --git a/mcp/reclass/classes/cluster/mcp-vpp-noha/infra/config.yml b/mcp/reclass/classes/cluster/mcp-fdio-noha/infra/config.yml
index 0263a57d0..6627ae6fe 100644
--- a/mcp/reclass/classes/cluster/mcp-vpp-noha/infra/config.yml
+++ b/mcp/reclass/classes/cluster/mcp-fdio-noha/infra/config.yml
@@ -9,7 +9,7 @@
 classes:
   - system.reclass.storage.system.openstack_gateway_single
   - cluster.mcp-common-noha.infra.config
-  - cluster.mcp-vpp-noha
+  - cluster.mcp-fdio-noha
   - cluster.all-mcp-arch-common.infra.config_pdf
 parameters:
   reclass:
diff --git a/mcp/reclass/classes/cluster/mcp-vpp-noha/infra/init.yml b/mcp/reclass/classes/cluster/mcp-fdio-noha/infra/init.yml
index f61519664..b1d890dfb 100644
--- a/mcp/reclass/classes/cluster/mcp-vpp-noha/infra/init.yml
+++ b/mcp/reclass/classes/cluster/mcp-fdio-noha/infra/init.yml
@@ -11,4 +11,4 @@ classes:
 
 parameters:
   _param:
-    cluster_name: mcp-vpp-noha
+    cluster_name: mcp-fdio-noha
diff --git a/mcp/reclass/classes/cluster/mcp-vpp-noha/infra/maas.yml b/mcp/reclass/classes/cluster/mcp-fdio-noha/infra/maas.yml
index e02d0304f..3520cc303 100644
--- a/mcp/reclass/classes/cluster/mcp-vpp-noha/infra/maas.yml
+++ b/mcp/reclass/classes/cluster/mcp-fdio-noha/infra/maas.yml
@@ -8,4 +8,4 @@
 ---
 classes:
   - cluster.all-mcp-arch-common.infra.maas
-  - cluster.mcp-vpp-noha.infra
+  - cluster.mcp-fdio-noha.infra
diff --git a/mcp/reclass/classes/cluster/mcp-vpp-noha/init.yml b/mcp/reclass/classes/cluster/mcp-fdio-noha/init.yml
index 41515cf6d..6e4f952fd 100644
--- a/mcp/reclass/classes/cluster/mcp-vpp-noha/init.yml
+++ b/mcp/reclass/classes/cluster/mcp-fdio-noha/init.yml
@@ -8,5 +8,5 @@
 ---
 classes:
   - cluster.mcp-common-noha.init_options
-  - cluster.mcp-vpp-noha.infra
-  - cluster.mcp-vpp-noha.openstack
+  - cluster.mcp-fdio-noha.infra
+  - cluster.mcp-fdio-noha.openstack
diff --git a/mcp/reclass/classes/cluster/mcp-vpp-noha/openstack/compute.yml.j2 b/mcp/reclass/classes/cluster/mcp-fdio-noha/openstack/compute.yml.j2
index 9142743da..2f1b8c39e 100644
--- a/mcp/reclass/classes/cluster/mcp-vpp-noha/openstack/compute.yml.j2
+++ b/mcp/reclass/classes/cluster/mcp-fdio-noha/openstack/compute.yml.j2
@@ -12,7 +12,7 @@
 classes:
   - service.neutron.compute.single
   - cluster.mcp-common-noha.openstack_compute
-  - cluster.mcp-vpp-noha
+  - cluster.mcp-fdio-noha
 parameters:
   linux:
     network:
diff --git a/mcp/reclass/classes/cluster/mcp-vpp-noha/openstack/control.yml b/mcp/reclass/classes/cluster/mcp-fdio-noha/openstack/control.yml
index 49dc3da4a..3c2cdefaa 100644
--- a/mcp/reclass/classes/cluster/mcp-vpp-noha/openstack/control.yml
+++ b/mcp/reclass/classes/cluster/mcp-fdio-noha/openstack/control.yml
@@ -9,4 +9,4 @@
 classes:
   - system.neutron.control.openvswitch.single
   - cluster.mcp-common-noha.openstack_control
-  - cluster.mcp-vpp-noha
+  - cluster.mcp-fdio-noha
diff --git a/mcp/reclass/classes/cluster/mcp-vpp-noha/openstack/gateway.yml.j2 b/mcp/reclass/classes/cluster/mcp-fdio-noha/openstack/gateway.yml.j2
index 27e6372b0..1b2ecb04b 100644
--- a/mcp/reclass/classes/cluster/mcp-vpp-noha/openstack/gateway.yml.j2
+++ b/mcp/reclass/classes/cluster/mcp-fdio-noha/openstack/gateway.yml.j2
@@ -12,7 +12,7 @@
 classes:
   - cluster.mcp-common-noha.openstack_gateway
   - service.neutron.gateway.single
-  - cluster.mcp-vpp-noha
+  - cluster.mcp-fdio-noha
 parameters:
   linux:
     network:
diff --git a/mcp/reclass/classes/cluster/mcp-vpp-noha/openstack/init.yml b/mcp/reclass/classes/cluster/mcp-fdio-noha/openstack/init.yml
index 79e231825..79e231825 100644
--- a/mcp/reclass/classes/cluster/mcp-vpp-noha/openstack/init.yml
+++ b/mcp/reclass/classes/cluster/mcp-fdio-noha/openstack/init.yml
diff --git a/mcp/reclass/nodes/cfg01.mcp-vpp-ha.local.yml b/mcp/reclass/nodes/cfg01.mcp-fdio-ha.local.yml
index 89bb3c3ca..defa03158 100644
--- a/mcp/reclass/nodes/cfg01.mcp-vpp-ha.local.yml
+++ b/mcp/reclass/nodes/cfg01.mcp-fdio-ha.local.yml
@@ -7,7 +7,7 @@
 ##############################################################################
 ---
 classes:
-  - cluster.mcp-vpp-ha.infra.config
+  - cluster.mcp-fdio-ha.infra.config
 parameters:
   _param:
     linux_system_codename: xenial
@@ -15,4 +15,4 @@ parameters:
   linux:
     system:
       name: cfg01
-      domain: mcp-vpp-ha.local
+      domain: mcp-fdio-ha.local
diff --git a/mcp/reclass/nodes/cfg01.mcp-vpp-noha.local.yml b/mcp/reclass/nodes/cfg01.mcp-fdio-noha.local.yml
index 381243168..9a7ac1476 100644
--- a/mcp/reclass/nodes/cfg01.mcp-vpp-noha.local.yml
+++ b/mcp/reclass/nodes/cfg01.mcp-fdio-noha.local.yml
@@ -7,7 +7,7 @@
 ##############################################################################
 ---
 classes:
-  - cluster.mcp-vpp-noha.infra.config
+  - cluster.mcp-fdio-noha.infra.config
 parameters:
   _param:
     linux_system_codename: xenial
@@ -15,4 +15,4 @@ parameters:
   linux:
     system:
       name: cfg01
-      domain: mcp-vpp-noha.local
+      domain: mcp-fdio-noha.local