X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=mcp%2Freclass%2Fclasses%2Fcluster%2Fbaremetal-mcp-ocata-ovs-ha%2Finfra%2Fmaas.yml;h=692f74106de4116eaa545bab2a19d92ce0b262ff;hb=09dce2a2643223d66aa1ac3a0ad8feebc082f521;hp=b2813f97e0e6d7623db347ac6437b1e2a8c53e1b;hpb=97345bd673c2991c6ab79f2f6780b3f6623d0601;p=fuel.git

diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/maas.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/maas.yml
index b2813f97e..692f74106 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/maas.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/maas.yml
@@ -1,131 +1,11 @@
+##############################################################################
+# Copyright (c) 2017 Mirantis Inc., Enea AB and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Apache License, Version 2.0
+# which accompanies this distribution, and is available at
+# http://www.apache.org/licenses/LICENSE-2.0
+##############################################################################
+---
 classes:
-- system.linux.system.repo.saltstack.xenial
-- system.maas.region.single
-- cluster.baremetal-mcp-ocata-ovs-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
-    linux_system_codename: xenial
-    maas_admin_username: opnfv
-    maas_admin_password: opnfv_secret
-    maas_db_password: opnfv_secret
-    dns_server01: 8.8.4.4
-    single_address: ${_param:infra_maas_node01_deploy_address}
-  maas:
-    region:
-      salt_master_ip: ${_param:infra_config_deploy_address}
-      domain: ${_param:cluster_domain}
-      maas_config:
-        commissioning_distro_series: 'xenial'
-        default_distro_series: 'xenial'
-        default_osystem: 'ubuntu'
-        default_storage_layout: 'lvm'
-        disk_erase_with_secure_erase: false
-        dnssec_validation: 'no'
-        enable_third_party_drivers: true
-        network_discovery: 'enabled'
-        default_min_hwe_kernel: 'hwe-16.04'
-      subnets:
-# TODO: parametrize address root (192.168.11), fabric-2, dhcp start/end?
-        192.168.11.0/24:
-          fabric: fabric-2
-          cidr: 192.168.11.0/24
-          gateway_ip: ${_param:single_address}
-          iprange:
-            start: 192.168.11.5
-            end: 192.168.11.250
-            type: dynamic
-      machines:
-        kvm01:
-          interface:
-            mac: "00:25:b5:a0:00:2a"
-          power_parameters:
-            power_address: "172.30.8.75"
-            power_password: "octopus"
-            power_type: ipmi
-            power_user: "admin"
-          architecture: 'amd64/generic'
-          distro_series: xenial
-          hwe_kernel: hwe-16.04
-        kvm02:
-          interface:
-            mac: "00:25:b5:a0:00:3a"
-          power_parameters:
-            power_address: "172.30.8.65"
-            power_password: "octopus"
-            power_type: ipmi
-            power_user: "admin"
-          architecture: 'amd64/generic'
-          distro_series: xenial
-          hwe_kernel: hwe-16.04
-        kvm03:
-          interface:
-            mac: "00:25:b5:a0:00:4a"
-          power_parameters:
-            power_address: "172.30.8.74"
-            power_password: "octopus"
-            power_type: ipmi
-            power_user: "admin"
-          architecture: 'amd64/generic'
-          distro_series: xenial
-          hwe_kernel: hwe-16.04
-        cmp001:
-          interface:
-            mac: "00:25:b5:a0:00:5a"
-          power_parameters:
-            power_address: "172.30.8.73"
-            power_password: "octopus"
-            power_type: ipmi
-            power_user: "admin"
-          architecture: 'amd64/generic'
-          distro_series: xenial
-          hwe_kernel: hwe-16.04
-        cmp002:
-          interface:
-            mac: "00:25:b5:a0:00:6a"
-          power_parameters:
-            power_address: "172.30.8.72"
-            power_password: "octopus"
-            power_type: ipmi
-            power_user: "admin"
-          architecture: 'amd64/generic'
-          distro_series: xenial
-          hwe_kernel: hwe-16.04
-  linux:
-    network:
-      interface:
-        dhcp_interface:
-          enabled: true
-          name: ${_param:dhcp_interface}
-          type: eth
-          proto: dhcp
-        primary_interface:
-          enabled: true
-          name: ${_param:primary_interface}
-          mtu: ${_param:interface_mtu}
-          proto: static
-          address: ${_param:infra_maas_node01_address}
-          netmask: 255.255.255.0
-          type: eth
-        pxe_interface:
-          enabled: true
-          name: ${_param:pxe_interface}
-          mtu: ${_param:pxe_interface_mtu}
-          proto: static
-          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
+  - cluster.baremetal-mcp-ocata-common-ha.infra.maas
+  - cluster.baremetal-mcp-ocata-ovs-ha.infra