aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2017-12-03 00:39:05 +0100
committerAlexandru Avadanii <Alexandru.Avadanii@enea.com>2017-12-04 14:35:01 +0100
commit3a86be3361346a698f755f4ebdb9c1a55bea7094 (patch)
tree27f4017a848a78f3d2e100bd7f3459d918bdd200
parentfda7372a1bffe11fc7a199ad3d4344c1b9e57e57 (diff)
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>
-rw-r--r--mcp/reclass/classes/cluster/virtual-mcp-pike-common-noha/infra/init.yml2
-rw-r--r--mcp/reclass/classes/cluster/virtual-mcp-pike-odl-noha/infra/init.yml14
-rw-r--r--mcp/reclass/classes/cluster/virtual-mcp-pike-odl-noha/init.yml4
-rw-r--r--mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-dpdk-noha/infra/init.yml14
-rw-r--r--mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-dpdk-noha/init.yml7
-rw-r--r--mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-noha/infra/init.yml14
-rw-r--r--mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-noha/init.yml7
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 2385411..9ae8d10 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 0000000..2cf01ee
--- /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 6a4ef9a..7575d89 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 0000000..50676fc
--- /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 e6a7da4..07e3ef2 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 0000000..0f21b91
--- /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 d217a69..b29ac95 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