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)

6 files changed, 0 insertions, 140 deletions

diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/infra/config.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/infra/config.yml
deleted file mode 100644
index ef0735743..000000000
--- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/infra/config.yml
+++ /dev/null
@@ -1,23 +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.virtual-mcp-ocata-common.infra.config
-  - cluster.virtual-mcp-ocata-ovs-dpdk
-parameters:
-  reclass:
-    storage:
-      node:
-        openstack_compute_node01:
-          params:
-            dpdk0_name: ${_param:opnfv_fn_vm_tertiary_interface}
-            dpdk0_pci: '"0000:00:05.0"'
-        openstack_compute_node02:
-          params:
-            dpdk0_name: ${_param:opnfv_fn_vm_tertiary_interface}
-            dpdk0_pci: '"0000:00:05.0"'
diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/init.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/init.yml
deleted file mode 100644
index 588e8bee0..000000000
--- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/init.yml
+++ /dev/null
@@ -1,19 +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:
-  - system.linux.system.single
-  - cluster.all-mcp-ocata-common
-  - cluster.virtual-mcp-ocata-common.init_options
-  - cluster.virtual-mcp-ocata-common.infra
-  - cluster.virtual-mcp-ocata-ovs-dpdk.openstack
-
-parameters:
-  _param:
-    cluster_domain: virtual-mcp-ocata-ovs-dpdk.local
-    cluster_name: virtual-mcp-ocata-ovs-dpdk
diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/openstack/compute.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/openstack/compute.yml
deleted file mode 100644
index ba6577e0d..000000000
--- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/openstack/compute.yml
+++ /dev/null
@@ -1,34 +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:
-  - 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.openstack_compute
-  - cluster.virtual-mcp-ocata-ovs-dpdk
-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/openstack/control.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/openstack/control.yml
deleted file mode 100644
index 780f66427..000000000
--- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/openstack/control.yml
+++ /dev/null
@@ -1,17 +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:
-  - system.neutron.control.openvswitch.single
-  - cluster.virtual-mcp-ocata-common.openstack_control
-  - cluster.virtual-mcp-ocata-ovs-dpdk
-parameters:
-  neutron:
-    server:
-      backend:
-        tenant_vlan_range: 1000:1999
diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/openstack/gateway.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/openstack/gateway.yml
deleted file mode 100644
index 4f215e807..000000000
--- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/openstack/gateway.yml
+++ /dev/null
@@ -1,26 +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.virtual-mcp-ocata-common.openstack_gateway
-  - service.neutron.gateway.single
-  - cluster.virtual-mcp-ocata-ovs-dpdk
-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/openstack/init.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/openstack/init.yml
deleted file mode 100644
index c27f73b05..000000000
--- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/openstack/init.yml
+++ /dev/null
@@ -1,21 +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.virtual-mcp-ocata-common.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"