From 3c08037cf9527ced474bc847cf7d463fb0439954 Mon Sep 17 00:00:00 2001 From: Alexandru Avadanii Date: Sat, 4 Aug 2018 18:46:48 +0200 Subject: [reclass] Move MaaS classes to common dir for NOHA Prepare for reusing MaaS-related reclass classes for NOHA scenarios. JIRA: FUEL-338 Change-Id: Ic8ddd5915563f58643ef8c7ac4055a1000db7d45 Signed-off-by: Alexandru Avadanii --- mcp/reclass/classes/cluster/mcp-common-ha/infra/config.yml.j2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'mcp/reclass/classes/cluster/mcp-common-ha/infra/config.yml.j2') diff --git a/mcp/reclass/classes/cluster/mcp-common-ha/infra/config.yml.j2 b/mcp/reclass/classes/cluster/mcp-common-ha/infra/config.yml.j2 index f6e0baa11..8cd3b33d1 100644 --- a/mcp/reclass/classes/cluster/mcp-common-ha/infra/config.yml.j2 +++ b/mcp/reclass/classes/cluster/mcp-common-ha/infra/config.yml.j2 @@ -19,7 +19,7 @@ classes: # - system.reclass.storage.system.stacklight_monitor_cluster # - system.reclass.storage.system.stacklight_telemetry_cluster - system.reclass.storage.system.infra_maas_single - - cluster.mcp-common-ha.include.lab_proxy_pdf + - cluster.all-mcp-arch-common.opnfv.lab_proxy_pdf - cluster.all-mcp-arch-common.infra.config_pdf parameters: _param: -- cgit 1.2.3-korg From 092caeeaea900b78f1cca0e13ad8cd05edab583a Mon Sep 17 00:00:00 2001 From: Alexandru Avadanii Date: Sun, 5 Aug 2018 06:24:54 +0200 Subject: [maas] Add reclass storage definitions for all Reclass storage definitions for mas01 node should be added to all ha/noha scenarios, only when/if baremetal cluster nodes are involved. JIRA: FUEL-382 Change-Id: I455b07894b68eb89903df94352159ea6519275b0 Signed-off-by: Alexandru Avadanii --- .../classes/cluster/all-mcp-arch-common/infra/config_pdf.yml.j2 | 3 +++ mcp/reclass/classes/cluster/mcp-common-ha/infra/config.yml.j2 | 1 - 2 files changed, 3 insertions(+), 1 deletion(-) (limited to 'mcp/reclass/classes/cluster/mcp-common-ha/infra/config.yml.j2') 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 495dfa27b..e94284df1 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 @@ -12,6 +12,9 @@ classes: - system.linux.system.single - system.linux.system.repo.mcp.salt - system.reclass.storage.salt +{%- if nm.cluster.has_baremetal_nodes %} + - system.reclass.storage.system.infra_maas_single +{%- endif %} - system.salt.master.api - system.salt.master.pkg - system.salt.minion.ca.salt_master diff --git a/mcp/reclass/classes/cluster/mcp-common-ha/infra/config.yml.j2 b/mcp/reclass/classes/cluster/mcp-common-ha/infra/config.yml.j2 index 8cd3b33d1..6bc508387 100644 --- a/mcp/reclass/classes/cluster/mcp-common-ha/infra/config.yml.j2 +++ b/mcp/reclass/classes/cluster/mcp-common-ha/infra/config.yml.j2 @@ -18,7 +18,6 @@ classes: # - system.reclass.storage.system.stacklight_log_cluster # - system.reclass.storage.system.stacklight_monitor_cluster # - system.reclass.storage.system.stacklight_telemetry_cluster - - system.reclass.storage.system.infra_maas_single - cluster.all-mcp-arch-common.opnfv.lab_proxy_pdf - cluster.all-mcp-arch-common.infra.config_pdf parameters: -- cgit 1.2.3-korg