diff options
Diffstat (limited to 'config/installers/fuel/pod_config.yml.j2')
-rw-r--r-- | config/installers/fuel/pod_config.yml.j2 | 37 |
1 files changed, 24 insertions, 13 deletions
diff --git a/config/installers/fuel/pod_config.yml.j2 b/config/installers/fuel/pod_config.yml.j2 index 769e55db..657bc2c1 100644 --- a/config/installers/fuel/pod_config.yml.j2 +++ b/config/installers/fuel/pod_config.yml.j2 @@ -12,25 +12,36 @@ parameters: maas: region: machines: -{%- for node in conf.nodes %} -{%- if node.node.type == 'baremetal' %} - -{%- if loop.index > nm.cmp001.idx %} - {{ 'cmp%03d' | format(loop.index - nm.cmp001.idx) }}: -{%- else %} - {{ 'kvm%02d' | format(loop.index) }}: -{%- endif %} + {%- set ctl_roles = 3 if 'virtual' not in conf else conf.virtual.nodes.control | length %} + {%- set has_cmp = True if 'virtual' not in conf else 'compute' in conf.virtual.nodes %} + {%- for node in conf.nodes %} + {%- if (node.node.type == 'baremetal' and ( + (has_cmp 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) }}: + {%- elif 'virtual' not in conf %} {#- strictly for Pharos verify job #} + kvm{{ '%02d' | format(loop.index) }}: + {%- else %} + {{ conf.virtual.nodes.control[loop.index0] }}: + {%- endif %} interface: mac: {{ node.interfaces[nm.idx_admin].mac_address }} power_parameters: power_address: {{ node.remote_management.address.rsplit('/')[0] }} - power_password: {{ node.remote_management.pass }} + power_pass: {{ 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 + distro_series: bionic hwe_kernel: ${_param:hwe_kernel} - -{%- endif %} -{%- endfor %} + {%- 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 %} {%- endif %} |