aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2018-02-03 16:43:08 +0000
committerGerrit Code Review <gerrit@opnfv.org>2018-02-03 16:43:08 +0000
commitcbc651f281c280fab346b044a2a41083f3ff9468 (patch)
treec4aa56fb5b627f51675f4c395c22cb4ead991908
parentc2174cd6d489b9079faec3523f175725da08f9df (diff)
parent378b4a72c27c941d5e37216edb23f224fbb58e26 (diff)
Merge "[baremetal] Fix: wrong nic name idf index"
-rw-r--r--mcp/reclass/classes/cluster/baremetal-mcp-pike-odl-ha/openstack/compute_pdf.yml.j22
-rw-r--r--mcp/reclass/classes/cluster/baremetal-mcp-pike-ovs-ha/openstack/compute_pdf.yml.j22
2 files changed, 2 insertions, 2 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 52090cc0a..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
@@ -16,7 +16,7 @@
{%- 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'][1] -%}
+ {%- set node = conf['idf']['fuel']['network']['node'][3] -%}
{%- set nic_admin = node['interfaces'][idx_admin] -%}
{%- set nic_mgmt = node['interfaces'][idx_mgmt] -%}
{%- set nic_private = node['interfaces'][idx_private] -%}
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-pike-ovs-ha/openstack/compute_pdf.yml.j2 b/mcp/reclass/classes/cluster/baremetal-mcp-pike-ovs-ha/openstack/compute_pdf.yml.j2
index 7b90c727a..f371c1d0d 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-pike-ovs-ha/openstack/compute_pdf.yml.j2
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-pike-ovs-ha/openstack/compute_pdf.yml.j2
@@ -16,7 +16,7 @@
{%- 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'][0] -%}
+ {%- set node = conf['idf']['fuel']['network']['node'][3] -%}
{%- set nic_admin = node['interfaces'][idx_admin] -%}
{%- set nic_mgmt = node['interfaces'][idx_mgmt] -%}
{%- set nic_private = node['interfaces'][idx_private] -%}