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, 103 deletions

diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/infra/config.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/infra/config.yml
deleted file mode 100644
index 8505e3503..000000000
--- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/infra/config.yml
+++ /dev/null
@@ -1,11 +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
diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/init.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/init.yml
deleted file mode 100644
index 56e676ba9..000000000
--- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/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.openstack
-
-parameters:
-  _param:
-    cluster_domain: virtual-mcp-ocata-ovs.local
-    cluster_name: virtual-mcp-ocata-ovs
diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/openstack/compute.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/openstack/compute.yml
deleted file mode 100644
index c9fee8842..000000000
--- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/openstack/compute.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.openstack_compute
-  - cluster.virtual-mcp-ocata-ovs
-parameters:
-  linux:
-    network:
-      interface:
-        br-mesh:
-          enabled: true
-          type: bridge
-          proto: static
-          address: ${_param:tenant_address}
-          netmask: 255.255.255.0
-          use_interfaces:
-            - ${_param:tenant_interface}
diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/openstack/control.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/openstack/control.yml
deleted file mode 100644
index 17250c338..000000000
--- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/openstack/control.yml
+++ /dev/null
@@ -1,12 +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
diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/openstack/gateway.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/openstack/gateway.yml
deleted file mode 100644
index 50c0f6e4d..000000000
--- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/openstack/gateway.yml
+++ /dev/null
@@ -1,25 +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
-parameters:
-  linux:
-    network:
-      interface:
-        br-mesh:
-          enabled: true
-          type: bridge
-          mtu: ${_param:interface_mtu}
-          proto: static
-          address: ${_param:tenant_address}
-          netmask: 255.255.255.0
-          use_interfaces:
-            - ${_param:tenant_interface}
diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/openstack/init.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/openstack/init.yml
deleted file mode 100644
index 4b083944a..000000000
--- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/openstack/init.yml
+++ /dev/null
@@ -1,13 +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,vxlan"