summaryrefslogtreecommitdiffstats
path: root/config/installers/fuel/pod_config.yml.j2
diff options
context:
space:
mode:
Diffstat (limited to 'config/installers/fuel/pod_config.yml.j2')
-rw-r--r--config/installers/fuel/pod_config.yml.j25
1 files changed, 3 insertions, 2 deletions
diff --git a/config/installers/fuel/pod_config.yml.j2 b/config/installers/fuel/pod_config.yml.j2
index edb63eec..657bc2c1 100644
--- a/config/installers/fuel/pod_config.yml.j2
+++ b/config/installers/fuel/pod_config.yml.j2
@@ -13,9 +13,10 @@ parameters:
region:
machines:
{%- 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 (
- loop.index > nm.cmp001.idx or loop.index0 < ctl_roles)) %}
+ (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 #}
@@ -31,7 +32,7 @@ parameters:
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}
{%- if loop.index > nm.cmp001.idx %}
disk_layout: