X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=mcp%2Freclass%2Fclasses%2Fcluster%2Fbaremetal-mcp-ocata-common%2Finfra%2Fkvm.yml;h=004f72a41c95075b58d3f34a268c25a7fc16ef20;hb=637ab12768237d45a37f3c41716d36d3de53821d;hp=b9c30f03b31379aeb655f955a7f5114a028848a2;hpb=a75af3d4c30af050dd15c0f875142f6328874fe4;p=fuel.git

diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/infra/kvm.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/infra/kvm.yml
index b9c30f03b..004f72a41 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/infra/kvm.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/infra/kvm.yml
@@ -1,3 +1,10 @@
+##############################################################################
+# 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.mcp.openstack
@@ -15,6 +22,7 @@ classes:
   # - system.salt.control.cluster.stacklight_server_cluster
   # - system.salt.control.cluster.stacklight_log_cluster
   # - system.salt.control.cluster.stacklight_telemetry_cluster
+  - cluster.baremetal-mcp-ocata-common.infra.kvm_init
 parameters:
   _param:
     linux_system_codename: xenial
@@ -24,7 +32,9 @@ parameters:
     cluster_node03_address: ${_param:infra_kvm_node03_address}
     keepalived_vip_interface: br-ctl
     keepalived_vip_virtual_router_id: 69
-    deploy_nic: ${_param:opnfv_baremetal_primary_nic}
+    # {dhcp,single}_nic are not used, but referenced
+    dhcp_nic: ${_param:opnfv_vcp_vm_primary_interface}
+    single_nic: ${_param:opnfv_vcp_vm_secondary_interface}
   salt:
     control:
       size:  # RAM 4096,8192,16384,32768,65536
@@ -68,7 +78,7 @@ parameters:
           cpu: 2
           ram: 2048
           disk_profile: small
-          net_profile: default
+          net_profile: default_ext
       cluster:
         internal:
           node:
@@ -110,6 +120,16 @@ parameters:
         eth0:
           bridge: br-ctl
           model: virtio
+      default_ext:
+        eth2:
+          bridge: br-mgmt
+          model: virtio
+        eth1:
+          bridge: br-ex
+          model: virtio
+        eth0:
+          bridge: br-ctl
+          model: virtio
   glusterfs:
     server:
       volumes:
@@ -126,37 +146,3 @@ parameters:
             network.remote-dio: 'On'
             diagnostics.client-log-level: WARNING
             diagnostics.brick-log-level: WARNING
-  linux:
-    network:
-      interface:
-        deploy:
-          enabled: true
-          type: eth
-          proto: manual
-          address: 0.0.0.0
-          netmask: 255.255.255.0
-          name: ${_param:deploy_nic}
-          noifupdown: true
-        br-mgmt:
-          enabled: true
-          proto: dhcp
-          type: bridge
-          name_servers: ${_param:opnfv_name_servers}
-          use_interfaces:
-            - ${_param:deploy_nic}
-          noifupdown: true
-        mgmt-vlan:
-          enabled: true
-          proto: manual
-          type: vlan
-          name: ${_param:deploy_nic}.${_param:opnfv_net_mgmt_vlan}
-          use_interfaces:
-            - ${_param:deploy_nic}
-        br-ctl:
-          enabled: true
-          type: bridge
-          proto: static
-          address: ${_param:single_address}
-          netmask: 255.255.255.0
-          use_interfaces:
-            - ${_param:deploy_nic}.${_param:opnfv_net_mgmt_vlan}