Rename reclass models to add "-ha" or "-noha"

Parse all reclass j2 templates, not only common + current scenario
(useful when adding new scenarios later).

JIRA: FUEL-310

Change-Id: I8e87af702f83c42cb8f766bf6f121449aa5f2c26
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
(cherry picked from commit 09dce2a2643223d66aa1ac3a0ad8feebc082f521)

4 files changed, 98 insertions, 0 deletions

diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk-noha/openstack/compute.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk-noha/openstack/compute.yml
new file mode 100644
index 000000000..2727c7d35
--- /dev/null
+++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk-noha/openstack/compute.yml
@@ -0,0 +1,34 @@
+##############################################################################
+# 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:
+  - system.linux.system.repo.mcp.openstack
+  - system.linux.system.repo.mcp.extra
+  - system.nova.compute.nfv.hugepages
+  - system.neutron.compute.nfv.dpdk
+  - cluster.virtual-mcp-ocata-common-noha.openstack_compute
+  - cluster.virtual-mcp-ocata-ovs-dpdk-noha
+parameters:
+  neutron:
+    compute:
+      backend:
+        tenant_network_types: ${_param:neutron_tenant_network_types}
+  linux:
+    network:
+      interface:
+        dpdk0:
+          name: ${_param:dpdk0_name}
+          pci: ${_param:dpdk0_pci}
+          driver: igb_uio
+          enabled: true
+          bridge: br-prv
+          type: dpdk_ovs_port
+          n_rxq: 2
+        br-prv:
+          enabled: true
+          type: dpdk_ovs_bridge
diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk-noha/openstack/control.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk-noha/openstack/control.yml
new file mode 100644
index 000000000..1929b093f
--- /dev/null
+++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk-noha/openstack/control.yml
@@ -0,0 +1,17 @@
+##############################################################################
+# 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:
+  - system.neutron.control.openvswitch.single
+  - cluster.virtual-mcp-ocata-common-noha.openstack_control
+  - cluster.virtual-mcp-ocata-ovs-dpdk-noha
+parameters:
+  neutron:
+    server:
+      backend:
+        tenant_vlan_range: 1000:1999
diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk-noha/openstack/gateway.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk-noha/openstack/gateway.yml
new file mode 100644
index 000000000..d4f86c4de
--- /dev/null
+++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk-noha/openstack/gateway.yml
@@ -0,0 +1,26 @@
+##############################################################################
+# 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.virtual-mcp-ocata-common-noha.openstack_gateway
+  - service.neutron.gateway.single
+  - cluster.virtual-mcp-ocata-ovs-dpdk-noha
+parameters:
+  neutron:
+    gateway:
+      backend:
+        tenant_network_types: ${_param:neutron_tenant_network_types}
+  linux:
+    network:
+      interface:
+        tenant_interface:
+          ovs_bridge: br-prv
+        br-prv:
+          enabled: true
+          type: ovs_bridge
+          mtu: ${_param:interface_mtu}
diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk-noha/openstack/init.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk-noha/openstack/init.yml
new file mode 100644
index 000000000..953f02143
--- /dev/null
+++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk-noha/openstack/init.yml
@@ -0,0 +1,21 @@
+##############################################################################
+# 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.virtual-mcp-ocata-common-noha.openstack_init
+parameters:
+  _param:
+    neutron_tenant_network_types: "flat,vlan"
+    compute_hugepages_size: 2M
+    compute_hugepages_count: 2048
+    compute_hugepages_mount: /mnt/hugepages_2M
+    compute_dpdk_driver: uio
+    compute_ovs_pmd_cpu_mask: "0x6"
+    compute_ovs_dpdk_socket_mem: "1024"
+    compute_ovs_dpdk_lcore_mask: "0x8"
+    compute_ovs_memory_channels: "2"