X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=mcp%2Freclass%2Fclasses%2Fcluster%2Fbaremetal-mcp-ocata-odl-ha%2Finfra%2Fmaas.yml;h=2a2fedb8605a2cacb2b8824d165d50878fb45700;hb=45720d1905fd64105e054fa7c898e7d7369897cc;hp=c4bc92954f856779bee2f75ade1310544656a737;hpb=00bf737316a29867a1fcc38753418d6e2fff9f27;p=fuel.git

diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/maas.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/maas.yml
index c4bc92954..2a2fedb86 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/maas.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/maas.yml
@@ -1,13 +1,13 @@
+---
 classes:
-- system.linux.system.repo.saltstack.xenial
-- system.maas.region.single
-- cluster.baremetal-mcp-ocata-odl-ha.infra
+  - system.linux.system.repo.saltstack.xenial
+  - system.maas.region.single
+  - cluster.baremetal-mcp-ocata-odl-ha.infra
 parameters:
   _param:
     dhcp_interface: ens3
     primary_interface: ens4
     pxe_interface: ens5
-    external_interface: ens6
     interface_mtu: 1500
     # MaaS has issues using MTU > 1500 for PXE interface
     pxe_interface_mtu: 1500
@@ -32,13 +32,13 @@ parameters:
         network_discovery: 'enabled'
         default_min_hwe_kernel: 'hwe-16.04'
       subnets:
-        # TODO: parametrize address root (192.168.11), dhcp start/end?
-        192.168.11.0/24:
-          cidr: 192.168.11.0/24
+        opnfv_maas_pxe:
+          name: ${_param:opnfv_maas_pxe_network}/24
+          cidr: ${_param:opnfv_maas_pxe_network}/24
           gateway_ip: ${_param:single_address}
           iprange:
-            start: 192.168.11.5
-            end: 192.168.11.250
+            start: ${_param:opnfv_maas_pxe_iprange_start}
+            end: ${_param:opnfv_maas_pxe_iprange_end}
             type: dynamic
           vlans:
             untagged:
@@ -125,11 +125,3 @@ parameters:
           address: ${_param:single_address}
           netmask: 255.255.255.0
           type: eth
-        external_interface:
-          enabled: true
-          name: ${_param:external_interface}
-          mtu: ${_param:interface_mtu}
-          proto: static
-          address: ${_param:infra_maas_node01_external_address}
-          netmask: 255.255.255.0
-          type: eth