summaryrefslogtreecommitdiffstats
path: root/mcp/reclass
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2018-08-05 09:57:44 +0200
committerAlexandru Avadanii <Alexandru.Avadanii@enea.com>2018-08-06 16:14:08 +0200
commit873341864209ef28b596e405378fce2ae0ca7f97 (patch)
treefc9fff713d92f633ec7ba106502b8c1af620d028 /mcp/reclass
parent092caeeaea900b78f1cca0e13ad8cd05edab583a (diff)
[reclass] Move system.single class to common
Include system.linux.system.single class globally in the common section, preparing for MaaS NOHA node definition. JIRA: FUEL-382 Change-Id: Icdfb2a90f356cd537631abe653950c0c30020551 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Diffstat (limited to 'mcp/reclass')
-rw-r--r--mcp/reclass/classes/cluster/all-mcp-arch-common/infra/config_pdf.yml.j21
-rw-r--r--mcp/reclass/classes/cluster/all-mcp-arch-common/init.yml.j21
-rw-r--r--mcp/reclass/classes/cluster/mcp-common-ha/infra/init.yml.j21
-rw-r--r--mcp/reclass/classes/cluster/mcp-odl-noha/init.yml1
-rw-r--r--mcp/reclass/classes/cluster/mcp-ovn-noha/init.yml1
-rw-r--r--mcp/reclass/classes/cluster/mcp-ovs-dpdk-noha/init.yml1
-rw-r--r--mcp/reclass/classes/cluster/mcp-ovs-noha/init.yml1
7 files changed, 1 insertions, 6 deletions
diff --git a/mcp/reclass/classes/cluster/all-mcp-arch-common/infra/config_pdf.yml.j2 b/mcp/reclass/classes/cluster/all-mcp-arch-common/infra/config_pdf.yml.j2
index e94284df1..a12e15663 100644
--- a/mcp/reclass/classes/cluster/all-mcp-arch-common/infra/config_pdf.yml.j2
+++ b/mcp/reclass/classes/cluster/all-mcp-arch-common/infra/config_pdf.yml.j2
@@ -9,7 +9,6 @@
---
classes:
- service.git.client
- - system.linux.system.single
- system.linux.system.repo.mcp.salt
- system.reclass.storage.salt
{%- if nm.cluster.has_baremetal_nodes %}
diff --git a/mcp/reclass/classes/cluster/all-mcp-arch-common/init.yml.j2 b/mcp/reclass/classes/cluster/all-mcp-arch-common/init.yml.j2
index 19475c717..987c5eb2c 100644
--- a/mcp/reclass/classes/cluster/all-mcp-arch-common/init.yml.j2
+++ b/mcp/reclass/classes/cluster/all-mcp-arch-common/init.yml.j2
@@ -7,6 +7,7 @@
##############################################################################
---
classes:
+ - system.linux.system.single
- cluster.all-mcp-arch-common.opnfv
parameters:
_param:
diff --git a/mcp/reclass/classes/cluster/mcp-common-ha/infra/init.yml.j2 b/mcp/reclass/classes/cluster/mcp-common-ha/infra/init.yml.j2
index 931dd1bab..c518d381f 100644
--- a/mcp/reclass/classes/cluster/mcp-common-ha/infra/init.yml.j2
+++ b/mcp/reclass/classes/cluster/mcp-common-ha/infra/init.yml.j2
@@ -7,7 +7,6 @@
##############################################################################
---
classes:
- - system.linux.system.single
- cluster.all-mcp-arch-common
# - cluster.mcp-common-ha.stacklight
# - cluster.mcp-common-ha.stacklight.client
diff --git a/mcp/reclass/classes/cluster/mcp-odl-noha/init.yml b/mcp/reclass/classes/cluster/mcp-odl-noha/init.yml
index a595bf0b5..e0c642a9f 100644
--- a/mcp/reclass/classes/cluster/mcp-odl-noha/init.yml
+++ b/mcp/reclass/classes/cluster/mcp-odl-noha/init.yml
@@ -7,7 +7,6 @@
##############################################################################
---
classes:
- - system.linux.system.single
- cluster.mcp-common-noha.init_options
- cluster.mcp-odl-noha.infra
- cluster.mcp-odl-noha.openstack
diff --git a/mcp/reclass/classes/cluster/mcp-ovn-noha/init.yml b/mcp/reclass/classes/cluster/mcp-ovn-noha/init.yml
index d4b6d85b7..82f4632bd 100644
--- a/mcp/reclass/classes/cluster/mcp-ovn-noha/init.yml
+++ b/mcp/reclass/classes/cluster/mcp-ovn-noha/init.yml
@@ -7,7 +7,6 @@
##############################################################################
---
classes:
- - system.linux.system.single
- cluster.mcp-common-noha.init_options
- cluster.mcp-ovn-noha.infra
- cluster.mcp-ovn-noha.openstack
diff --git a/mcp/reclass/classes/cluster/mcp-ovs-dpdk-noha/init.yml b/mcp/reclass/classes/cluster/mcp-ovs-dpdk-noha/init.yml
index 96e2c9425..35c3e7655 100644
--- a/mcp/reclass/classes/cluster/mcp-ovs-dpdk-noha/init.yml
+++ b/mcp/reclass/classes/cluster/mcp-ovs-dpdk-noha/init.yml
@@ -7,7 +7,6 @@
##############################################################################
---
classes:
- - system.linux.system.single
- cluster.mcp-common-noha.init_options
- cluster.mcp-ovs-dpdk-noha.infra
- cluster.mcp-ovs-dpdk-noha.openstack
diff --git a/mcp/reclass/classes/cluster/mcp-ovs-noha/init.yml b/mcp/reclass/classes/cluster/mcp-ovs-noha/init.yml
index a453af50b..24de77a24 100644
--- a/mcp/reclass/classes/cluster/mcp-ovs-noha/init.yml
+++ b/mcp/reclass/classes/cluster/mcp-ovs-noha/init.yml
@@ -7,7 +7,6 @@
##############################################################################
---
classes:
- - system.linux.system.single
- cluster.mcp-common-noha.init_options
- cluster.mcp-ovs-noha.infra
- cluster.mcp-ovs-noha.openstack