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

diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-noha/infra/config.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-noha/infra/config.yml
new file mode 100644
index 000000000..4cca642aa
--- /dev/null
+++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-noha/infra/config.yml
@@ -0,0 +1,11 @@
+##############################################################################
+# 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.infra.config
+  - cluster.virtual-mcp-ocata-ovs-noha
diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-noha/init.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-noha/init.yml
new file mode 100644
index 000000000..bf9f0d065
--- /dev/null
+++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-noha/init.yml
@@ -0,0 +1,19 @@
+##############################################################################
+# 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-noha.init_options
+  - cluster.virtual-mcp-ocata-common-noha.infra
+  - cluster.virtual-mcp-ocata-ovs-noha.openstack
+
+parameters:
+  _param:
+    cluster_domain: virtual-mcp-ocata-ovs-noha.local
+    cluster_name: virtual-mcp-ocata-ovs-noha
diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-noha/openstack/compute.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-noha/openstack/compute.yml
new file mode 100644
index 000000000..c986ce878
--- /dev/null
+++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-noha/openstack/compute.yml
@@ -0,0 +1,23 @@
+##############################################################################
+# 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_compute
+  - cluster.virtual-mcp-ocata-ovs-noha
+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-noha/openstack/control.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-noha/openstack/control.yml
new file mode 100644
index 000000000..8df56bdb2
--- /dev/null
+++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-noha/openstack/control.yml
@@ -0,0 +1,12 @@
+##############################################################################
+# 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-noha
diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-noha/openstack/gateway.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-noha/openstack/gateway.yml
new file mode 100644
index 000000000..3751a079c
--- /dev/null
+++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-noha/openstack/gateway.yml
@@ -0,0 +1,25 @@
+##############################################################################
+# 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-noha
+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-noha/openstack/init.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-noha/openstack/init.yml
new file mode 100644
index 000000000..dfaafb706
--- /dev/null
+++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-noha/openstack/init.yml
@@ -0,0 +1,13 @@
+##############################################################################
+# 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,vxlan"