diff options
author | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2018-08-07 13:19:13 +0000 |
---|---|---|
committer | Gerrit Code Review <gerrit@opnfv.org> | 2018-08-07 13:19:13 +0000 |
commit | b466cb8270ebf9515d6acbad4d4dcfe28af47dd6 (patch) | |
tree | bbba9dc0d30696c1ffecb8caa03f5e1f821e46dc /mcp/reclass/classes/cluster/all-mcp-arch-common/infra/config_pdf.yml.j2 | |
parent | 9b106457ce0cc0d4d03115ef94c3b386164ea051 (diff) | |
parent | 291d972bdd666d36e35f8bb3953b0da806ea0eea (diff) |
Merge changes from topics 'baremetal-noha', 'move-maas-classes'
* changes:
[noha] cinder: Align VG name with HA scenarios
[reclass] Move system.single class to common
[maas] Add reclass storage definitions for all
[reclass] Move MaaS classes to common dir for NOHA
Diffstat (limited to 'mcp/reclass/classes/cluster/all-mcp-arch-common/infra/config_pdf.yml.j2')
-rw-r--r-- | mcp/reclass/classes/cluster/all-mcp-arch-common/infra/config_pdf.yml.j2 | 4 |
1 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..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,9 +9,11 @@ --- classes: - service.git.client - - 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 |