Fix parametrized nic name variables

[fuel.git] / mcp / reclass / classes / cluster / baremetal-mcp-ocata-ovs-dpdk-ha / infra / maas.yml

diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/infra/maas.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/infra/maas.yml
index 783e4ec..9c76526 100644 (file)
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/infra/maas.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/infra/maas.yml
@@ -1,13 +1,13 @@
 ---
 classes:
-  - system.linux.system.repo.saltstack.xenial
   - system.maas.region.single
+  - service.maas.cluster.single
   - cluster.baremetal-mcp-ocata-ovs-dpdk-ha.infra
 parameters:
   _param:
-    dhcp_interface: ens3
-    primary_interface: ens4
-    pxe_interface: ens5
+    dhcp_interface: ${_param:opnfv_fn_vm_primary_interface}
+    primary_interface: ${_param:opnfv_fn_vm_secondary_interface}
+    pxe_interface: ${_param:opnfv_fn_vm_tertiary_interface}
     interface_mtu: 1500
     # MaaS has issues using MTU > 1500 for PXE interface
     pxe_interface_mtu: 1500
@@ -33,12 +33,12 @@ parameters:
         default_min_hwe_kernel: 'hwe-16.04'
       subnets:
         opnfv_maas_pxe:
-          name: ${_param:opnfv_maas_pxe_network}/24
-          cidr: ${_param:opnfv_maas_pxe_network}/24
+          name: ${_param:opnfv_maas_pxe_network_address}/24
+          cidr: ${_param:opnfv_maas_pxe_network_address}/24
           gateway_ip: ${_param:single_address}
           iprange:
-            start: ${_param:opnfv_maas_pxe_iprange_start}
-            end: ${_param:opnfv_maas_pxe_iprange_end}
+            start: ${_param:opnfv_maas_pxe_start_address}
+            end: ${_param:opnfv_maas_pxe_end_address}
             type: dynamic
           vlans:
             untagged: