virtual: Add infra/init.yml for each scenario

Align our reclass model for virtual PODs with baremetal, by adding
an infra init file for each scenario, setting up cluster_name via
scenario infra init instead of scenario init.
While at it, reduce redundancy by defining cluster_domain based on
cluster_name via common infra init.

JIRA: FUEL-310

Change-Id: I5e89c883853fa66cb1c1fc69ce5766ee136ac477
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>

7 files changed, 47 insertions, 15 deletions

diff --git a/mcp/reclass/classes/cluster/virtual-mcp-pike-common-noha/infra/init.yml b/mcp/reclass/classes/cluster/virtual-mcp-pike-common-noha/infra/init.yml
index 2385411b4..9ae8d1097 100644
--- a/mcp/reclass/classes/cluster/virtual-mcp-pike-common-noha/infra/init.yml
+++ b/mcp/reclass/classes/cluster/virtual-mcp-pike-common-noha/infra/init.yml
@@ -7,6 +7,8 @@
 ##############################################################################
 ---
 parameters:
+  _param:
+    cluster_domain: ${_param:cluster_name}.local
   linux:
     network:
       host:
diff --git a/mcp/reclass/classes/cluster/virtual-mcp-pike-odl-noha/infra/init.yml b/mcp/reclass/classes/cluster/virtual-mcp-pike-odl-noha/infra/init.yml
new file mode 100644
index 000000000..2cf01eeec
--- /dev/null
+++ b/mcp/reclass/classes/cluster/virtual-mcp-pike-odl-noha/infra/init.yml
@@ -0,0 +1,14 @@
+##############################################################################
+# 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-pike-common-noha.infra
+
+parameters:
+  _param:
+    cluster_name: virtual-mcp-pike-odl-noha
diff --git a/mcp/reclass/classes/cluster/virtual-mcp-pike-odl-noha/init.yml b/mcp/reclass/classes/cluster/virtual-mcp-pike-odl-noha/init.yml
index 6a4ef9a48..7575d89b8 100644
--- a/mcp/reclass/classes/cluster/virtual-mcp-pike-odl-noha/init.yml
+++ b/mcp/reclass/classes/cluster/virtual-mcp-pike-odl-noha/init.yml
@@ -10,11 +10,9 @@ classes:
   - system.linux.system.single
   - cluster.all-mcp-arch-common
   - cluster.virtual-mcp-pike-common-noha.init_options
-  - cluster.virtual-mcp-pike-common-noha.infra
+  - cluster.virtual-mcp-pike-odl-noha.infra
   - cluster.virtual-mcp-pike-odl-noha.openstack
 
 parameters:
   _param:
-    cluster_domain: virtual-mcp-pike-odl-noha.local
-    cluster_name: virtual-mcp-pike-odl-noha
     opendaylight_service_host: 172.16.10.111
diff --git a/mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-dpdk-noha/infra/init.yml b/mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-dpdk-noha/infra/init.yml
new file mode 100644
index 000000000..50676fc2c
--- /dev/null
+++ b/mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-dpdk-noha/infra/init.yml
@@ -0,0 +1,14 @@
+##############################################################################
+# 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-pike-common-noha.infra
+
+parameters:
+  _param:
+    cluster_name: virtual-mcp-pike-ovs-dpdk-noha
diff --git a/mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-dpdk-noha/init.yml b/mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-dpdk-noha/init.yml
index e6a7da4df..07e3ef2ca 100644
--- a/mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-dpdk-noha/init.yml
+++ b/mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-dpdk-noha/init.yml
@@ -10,10 +10,5 @@ classes:
   - system.linux.system.single
   - cluster.all-mcp-arch-common
   - cluster.virtual-mcp-pike-common-noha.init_options
-  - cluster.virtual-mcp-pike-common-noha.infra
+  - cluster.virtual-mcp-pike-ovs-dpdk-noha.infra
   - cluster.virtual-mcp-pike-ovs-dpdk-noha.openstack
-
-parameters:
-  _param:
-    cluster_domain: virtual-mcp-pike-ovs-dpdk-noha.local
-    cluster_name: virtual-mcp-pike-ovs-dpdk-noha
diff --git a/mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-noha/infra/init.yml b/mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-noha/infra/init.yml
new file mode 100644
index 000000000..0f21b9161
--- /dev/null
+++ b/mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-noha/infra/init.yml
@@ -0,0 +1,14 @@
+##############################################################################
+# 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-pike-common-noha.infra
+
+parameters:
+  _param:
+    cluster_name: virtual-mcp-pike-ovs-noha
diff --git a/mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-noha/init.yml b/mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-noha/init.yml
index d217a6978..b29ac95ca 100644
--- a/mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-noha/init.yml
+++ b/mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-noha/init.yml
@@ -10,10 +10,5 @@ classes:
   - system.linux.system.single
   - cluster.all-mcp-arch-common
   - cluster.virtual-mcp-pike-common-noha.init_options
-  - cluster.virtual-mcp-pike-common-noha.infra
+  - cluster.virtual-mcp-pike-ovs-noha.infra
   - cluster.virtual-mcp-pike-ovs-noha.openstack
-
-parameters:
-  _param:
-    cluster_domain: virtual-mcp-pike-ovs-noha.local
-    cluster_name: virtual-mcp-pike-ovs-noha