summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2018-08-31 02:13:10 +0200
committerAlexandru Avadanii <Alexandru.Avadanii@enea.com>2018-08-31 17:36:44 +0200
commit738497a53b80e3b770457b4160532274fd924388 (patch)
tree4b8aafcb969ea82c49df1bd5319f67062ceb7ff9
parent66786e0de4a2edf4dfce2596d4c0e6f5ec844e24 (diff)
[fuel] IA: sync maas:machines changes
Change-Id: Ib4859e4ada3d72e7e848114620ff5405c26b3126 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
-rw-r--r--config/installers/fuel/pod_config.yml.j232
1 files changed, 21 insertions, 11 deletions
diff --git a/config/installers/fuel/pod_config.yml.j2 b/config/installers/fuel/pod_config.yml.j2
index 769e55d..ad40689 100644
--- a/config/installers/fuel/pod_config.yml.j2
+++ b/config/installers/fuel/pod_config.yml.j2
@@ -12,14 +12,17 @@ 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 %}
+ {%- 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) }}:
+ {%- 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:
@@ -30,7 +33,14 @@ parameters:
architecture: {{ node.node.arch | dpkg_arch }}/generic
distro_series: xenial
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 %}