1 files changed, 9 insertions, 3 deletions

diff --git a/mcp/reclass/classes/cluster/mcp-common-ha/openstack_compute_pdf.yml.j2 b/mcp/reclass/classes/cluster/mcp-common-ha/openstack_compute_pdf.yml.j2
index 51a6dbd68..0b1c5bbf2 100644
--- a/mcp/reclass/classes/cluster/mcp-common-ha/openstack_compute_pdf.yml.j2
+++ b/mcp/reclass/classes/cluster/mcp-common-ha/openstack_compute_pdf.yml.j2
@@ -15,6 +15,7 @@
 parameters:
   _param:
     # Should later be determined via PDF/IDF, AArch64 has ESP on /dev/sda1
+{%- if nm.cmp001.idx < conf.nodes | length %}
 {%- if conf.nodes[nm.cmp001.idx].node.type == 'virtual' %}
     ~cinder_lvm_devices: ['/dev/vdb']
 {%- elif conf.nodes[nm.cmp001.idx].node.arch == 'aarch64' or
@@ -23,6 +24,7 @@ parameters:
 {%- else %}
     ~cinder_lvm_devices: ['/dev/sda1']
 {%- endif %}
+{%- endif %}
   linux:
     network:
       bridge: openvswitch
@@ -30,7 +32,7 @@ parameters:
         # PXE/admin is always untagged on computes
         pxe_admin_int:
           enabled: true
-          name: {{ nm.cmp001.nic_admin }}
+          name: ${_param:pxe_admin_interface}
           proto: static
           type: eth
           address: ${_param:pxe_admin_address}
@@ -42,6 +44,9 @@ parameters:
 {%- if nm.cmp001.nic_admin in nics %}
   {%- do nics.pop(nm.cmp001.nic_admin) %}
 {%- endif %}
+{%- if ma.interface_str(nm.cmp001.nic_public, nm.vlan_public) in nics %}
+  {%- do nics.pop(nm.cmp001.nic_public) %}
+{%- endif %}
 
 {{ ma.linux_network_interfaces_nic(nics) }}
 
@@ -66,11 +71,12 @@ parameters:
             - {{ ma.interface_str(nm.cmp001.nic_public, nm.vlan_public) }}
           gateway: ${_param:opnfv_net_public_gw}
           name_servers: {{ nm.dns_public }}
-        ovs_port_{{ nm.cmp001.nic_public }}:
+          noifupdown: true
+        {{ ma.interface_str(nm.cmp001.nic_public, nm.vlan_public) }}:
           enabled: true
-          name: {{ ma.interface_str(nm.cmp001.nic_public, nm.vlan_public) }}
           proto: manual
           ovs_port_type: OVSPort
           type: ovs_port
           ovs_bridge: br-floating
           bridge: br-floating
+          mtu: ${_param:interface_mtu}