diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2018-08-05 06:24:54 +0200 |
|---|---|---|
| committer | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2018-08-06 16:14:08 +0200 |
| commit | 092caeeaea900b78f1cca0e13ad8cd05edab583a (patch) | |
| tree | 451f9fe4e2606170cf0ef7b6f5b0cb907eb9136e | |
| parent | 3c08037cf9527ced474bc847cf7d463fb0439954 (diff) | |
[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 <Alexandru.Avadanii@enea.com>
| -rw-r--r-- | mcp/reclass/classes/cluster/all-mcp-arch-common/infra/config_pdf.yml.j2 | 3 | ||||
| -rw-r--r-- | mcp/reclass/classes/cluster/mcp-common-ha/infra/config.yml.j2 | 1 |
2 files changed, 3 insertions, 1 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 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: |