aboutsummaryrefslogtreecommitdiffstats
path: root/mcp/reclass/classes/cluster/all-mcp-arch-common/infra
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2018-08-31 02:16:08 +0200
committerAlexandru Avadanii <Alexandru.Avadanii@enea.com>2018-09-06 15:34:44 +0200
commitf7d7eece07de9ba44a0d11c68f0685b60752e4b8 (patch)
treed14c8715c88af6e44d5ab22c4b1a0842106858b1 /mcp/reclass/classes/cluster/all-mcp-arch-common/infra
parent0b8c15936be133c6c4aeec36d57329f862f43544 (diff)
[submodule] Bump Pharos for maas:machines sync
Drop duplicate maas:machines definitions which could cause conflicts in rare corner cases. Slightly refactor j2 template expansion to make `conf.virtual.nodes` available during first stage. Change-Id: I04d56e346b12c6eb97da5c0c0ab1e3446e5fc1b8 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Diffstat (limited to 'mcp/reclass/classes/cluster/all-mcp-arch-common/infra')
-rw-r--r--mcp/reclass/classes/cluster/all-mcp-arch-common/infra/maas.yml.j231
1 files changed, 0 insertions, 31 deletions
diff --git a/mcp/reclass/classes/cluster/all-mcp-arch-common/infra/maas.yml.j2 b/mcp/reclass/classes/cluster/all-mcp-arch-common/infra/maas.yml.j2
index 7ee1aa13f..ea97773f1 100644
--- a/mcp/reclass/classes/cluster/all-mcp-arch-common/infra/maas.yml.j2
+++ b/mcp/reclass/classes/cluster/all-mcp-arch-common/infra/maas.yml.j2
@@ -106,37 +106,6 @@ parameters:
=m+zE
-----END PGP PUBLIC KEY BLOCK-----
{%- endif %}
- machines:
- {%- set pxe_interface = conf.idf.net_config.admin.interface %}
- {%- set ctl_roles = conf.virtual.nodes.control | length %}
- {%- for node in conf.nodes %}
- {%- if (node.node.type == 'baremetal' and (
- loop.index > nm.cmp001.idx or loop.index0 < ctl_roles)) %}
- {%- if loop.index > nm.cmp001.idx %}
- cmp{{ '%03d' | format(loop.index - nm.cmp001.idx) }}:
- {%- else %}
- {{ conf.virtual.nodes.control[loop.index0] }}:
- {%- endif %}
- interface:
- mac: {{ node.interfaces[pxe_interface].mac_address }}
- power_parameters:
- power_address: {{ node.remote_management.address.rsplit('/')[0] }}
- power_password: {{ node.remote_management.pass }}
- power_type: {{ node.remote_management.type }}
- power_user: {{ node.remote_management.user }}
- architecture: {{ node.node.arch | dpkg_arch }}/generic
- distro_series: xenial
- hwe_kernel: ${_param:hwe_kernel}
- {%- if loop.index > nm.cmp001.idx %}
- disk_layout:
- type: lvm
- root_device: sda
- volume_group: vgroot
- volume_name: lvroot
- volume_size: 100
- {%- endif %}
- {%- endif %}
- {%- endfor %}
salt_master_ip: ${_param:reclass_config_master}
domain: ${_param:cluster_domain}
maas_config: