summaryrefslogtreecommitdiffstats
path: root/mcp/reclass/classes/cluster/baremetal-mcp-pike-odl-ha
diff options
context:
space:
mode:
Diffstat (limited to 'mcp/reclass/classes/cluster/baremetal-mcp-pike-odl-ha')
-rw-r--r--mcp/reclass/classes/cluster/baremetal-mcp-pike-odl-ha/openstack/compute_pdf.yml.j222
1 files changed, 13 insertions, 9 deletions
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-pike-odl-ha/openstack/compute_pdf.yml.j2 b/mcp/reclass/classes/cluster/baremetal-mcp-pike-odl-ha/openstack/compute_pdf.yml.j2
index 78a2e8022..f371c1d0d 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-pike-odl-ha/openstack/compute_pdf.yml.j2
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-pike-odl-ha/openstack/compute_pdf.yml.j2
@@ -6,14 +6,14 @@
# http://www.apache.org/licenses/LICENSE-2.0
##############################################################################
{# NOTE: br-{mgmt,ctl} are cross-referenced, careful when changing names #}
-{%- if conf.net_config is defined and conf.idf is defined -%}
+{%- if conf.idf is defined and conf.idf.net_config is defined -%}
{#- NOTE: Currently, we assume all cluster nodes use the same mapping -#}
{#- Determine interface index for each network (plumbing vars) -#}
- {%- set idx_admin = conf['net_config']['admin']['interface'] -%}
- {%- set idx_mgmt = conf['net_config']['mgmt']['interface'] -%}
- {%- set idx_private = conf['net_config']['private']['interface'] -%}
- {%- set idx_public = conf['net_config']['public']['interface'] -%}
+ {%- set idx_admin = conf['idf']['net_config']['admin']['interface'] -%}
+ {%- set idx_mgmt = conf['idf']['net_config']['mgmt']['interface'] -%}
+ {%- set idx_private = conf['idf']['net_config']['private']['interface'] -%}
+ {%- set idx_public = conf['idf']['net_config']['public']['interface'] -%}
{#- Physical interface OS name for each network (e.g. em1, enp1s0f1) -#}
{%- set node = conf['idf']['fuel']['network']['node'][3] -%}
@@ -26,10 +26,10 @@
{%- set bus_private = node['busaddr'][idx_private] -%}
{#- VLAN for each network (only untagged 'admin' is supported by MaaS config!) -#}
- {%- set vlan_admin = conf['net_config']['admin']['vlan'] -%}
- {%- set vlan_mgmt = conf['net_config']['mgmt']['vlan'] -%}
- {%- set vlan_private = conf['net_config']['private']['vlan'] -%}
- {%- set vlan_public = conf['net_config']['public']['vlan'] -%}
+ {%- set vlan_admin = conf['idf']['net_config']['admin']['vlan'] -%}
+ {%- set vlan_mgmt = conf['idf']['net_config']['mgmt']['vlan'] -%}
+ {%- set vlan_private = conf['idf']['net_config']['private']['vlan'] -%}
+ {%- set vlan_public = conf['idf']['net_config']['public']['vlan'] -%}
{%- else -%}
{%- set nic_admin = 'enp6s0' -%}
{%- set nic_mgmt = 'enp6s0' -%}
@@ -53,7 +53,11 @@ parameters:
{{ nic }}:
enabled: true
type: eth
+ {%- if nic == nic_admin %}
+ proto: dhcp
+ {%- else %}
proto: manual
+ {%- endif %}
name: {{ nic }}
{%- endfor %}