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

diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router-noha/openstack/compute.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router-noha/openstack/compute.yml
new file mode 100644
index 000000000..972b5c646
--- /dev/null
+++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router-noha/openstack/compute.yml
@@ -0,0 +1,56 @@
+##############################################################################
+# 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-odl-router-noha
+parameters:
+  opendaylight:
+    client:
+      ovsdb_server_iface: ptcp:6639:127.0.0.1
+      ovsdb_odl_iface: tcp:${_param:opendaylight_service_host}:6640
+      tunnel_ip: ${_param:tenant_address}
+      provider_mappings: physnet1:br-floating
+  linux:
+    network:
+      gateway: ${_param:openstack_gateway_address}
+      interface:
+        external_interface:
+          enabled: true
+          name: ${_param:external_interface}
+          mtu: ${_param:interface_mtu}
+          proto: manual
+          type: eth
+        br-mesh:
+          enabled: true
+          type: bridge
+          proto: static
+          address: ${_param:tenant_address}
+          netmask: 255.255.255.0
+          gateway: 10.1.0.110
+          use_interfaces:
+            - ${_param:tenant_interface}
+        br-floating:
+          enabled: true
+          type: ovs_bridge
+          mtu: ${_param:interface_mtu}
+        float-to-ex:
+          enabled: true
+          type: ovs_port
+          mtu: ${_param:interface_mtu}
+          bridge: br-floating
+        br-ex:
+          enabled: true
+          type: bridge
+          mtu: ${_param:interface_mtu}
+          address: ${_param:external_address}
+          netmask: 255.255.255.0
+          use_interfaces:
+            - ${_param:external_interface}
+          use_ovs_ports:
+            - float-to-ex
diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router-noha/openstack/control.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router-noha/openstack/control.yml
new file mode 100644
index 000000000..912dc10c9
--- /dev/null
+++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router-noha/openstack/control.yml
@@ -0,0 +1,42 @@
+##############################################################################
+# 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.opendaylight.single
+  - cluster.virtual-mcp-ocata-common-noha.openstack_control
+  - cluster.virtual-mcp-ocata-odl-router-noha
+parameters:
+  neutron:
+    server:
+      backend:
+        router: ${_param:opendaylight_router}
+  haproxy:
+    proxy:
+      listen:
+        opendaylight-web:
+          type: general-service
+          service_name: opendaylight
+          binds:
+            - address: ${_param:cluster_vip_address}
+              port: 8181
+          servers:
+            - name: odl01
+              host: ${_param:opendaylight_service_host}
+              port: 8181
+              params: ${_param:haproxy_check}
+        opendaylight-rest:
+          type: general-service
+          service_name: opendaylight
+          binds:
+            - address: ${_param:cluster_vip_address}
+              port: 8282
+          servers:
+            - name: odl01
+              host: ${_param:opendaylight_service_host}
+              port: 8282
+              params: ${_param:haproxy_check}
diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router-noha/openstack/gateway.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router-noha/openstack/gateway.yml
new file mode 100644
index 000000000..e2c94bb1c
--- /dev/null
+++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router-noha/openstack/gateway.yml
@@ -0,0 +1,41 @@
+##############################################################################
+# 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
+  - system.neutron.gateway.opendaylight.single
+  - cluster.virtual-mcp-ocata-odl-router-noha
+parameters:
+  _param:
+    neutron_agents:
+      - neutron-dhcp-agent
+      - neutron-metadata-agent
+  neutron:
+    gateway:
+      pkgs: ${_param:neutron_agents}
+      services: ${_param:neutron_agents}
+      backend:
+        router: ${_param:opendaylight_router}
+  opendaylight:
+    client:
+      ovsdb_server_iface: ptcp:6639:127.0.0.1
+      ovsdb_odl_iface: tcp:${_param:opendaylight_service_host}:6640
+      tunnel_ip: ${_param:tenant_address}
+      provider_mappings: physnet1:br-floating
+  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-odl-router-noha/openstack/init.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router-noha/openstack/init.yml
new file mode 100644
index 000000000..f4b78c3b5
--- /dev/null
+++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router-noha/openstack/init.yml
@@ -0,0 +1,29 @@
+##############################################################################
+# 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"
+    opendaylight_router: odl-router_v2
+  linux:
+    system:
+      repo:
+        uca:
+          source: "deb http://ubuntu-cloud.archive.canonical.com/ubuntu xenial-updates/ocata main"
+          architectures: amd64
+          key_id: EC4926EA
+          key_server: keyserver.ubuntu.com
+    network:
+      host:
+        odl01:
+          address: 172.16.10.111
+          names:
+            - odl01
+            - odl01.${_param:cluster_domain}