X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=mcp%2Freclass%2Fclasses%2Fcluster%2Fbaremetal-mcp-ocata-ovs-dpdk-ha%2Finfra%2Fkvm.yml;h=f7a8fe3526f0b819a87117865c026a5c21fe4346;hb=92530f89c061b0070766e431f839feb368e2e4ac;hp=d5f2e92d1506613c24879977cbf9bd67acd3ff1a;hpb=c7f410e3cb43dd70263160d7341853de5cb573ef;p=fuel.git

diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/infra/kvm.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/infra/kvm.yml
index d5f2e92d1..f7a8fe352 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/infra/kvm.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/infra/kvm.yml
@@ -1,162 +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.mcp.openstack
-  - system.linux.system.repo.mcp.extra
-  - service.keepalived.cluster.single
-  - system.glusterfs.server.volume.glance
-  - system.glusterfs.server.volume.keystone
-  - system.glusterfs.server.cluster
-  - system.salt.control.virt
-  - system.salt.control.cluster.openstack_control_cluster
-  - system.salt.control.cluster.openstack_proxy_cluster
-  - system.salt.control.cluster.openstack_database_cluster
-  - system.salt.control.cluster.openstack_message_queue_cluster
-  - system.salt.control.cluster.openstack_telemetry_cluster
-  # - 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
   - cluster.baremetal-mcp-ocata-ovs-dpdk-ha.infra
-parameters:
-  _param:
-    linux_system_codename: xenial
-    cluster_vip_address: ${_param:infra_kvm_address}
-    cluster_node01_address: ${_param:infra_kvm_node01_address}
-    cluster_node02_address: ${_param:infra_kvm_node02_address}
-    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}
-  salt:
-    control:
-      size:  # RAM 4096,8192,16384,32768,65536
-        # Default production sizing
-        openstack.control:
-          cpu: 4
-          ram: 12288
-          disk_profile: small
-          net_profile: default
-        openstack.database:
-          cpu: 4
-          ram: 6144
-          disk_profile: large
-          net_profile: default
-        openstack.message_queue:
-          cpu: 4
-          ram: 2048
-          disk_profile: small
-          net_profile: default
-        openstack.telemetry:
-          cpu: 2
-          ram: 3072
-          disk_profile: xxlarge
-          net_profile: default
-        openstack.proxy:
-          cpu: 2
-          ram: 2048
-          disk_profile: small
-          net_profile: default
-          # stacklight.log:
-          #   cpu: 2
-          #   ram: 4096
-          #   disk_profile: xxlarge
-          #   net_profile: default
-          # stacklight.server:
-          #   cpu: 2
-          #   ram: 4096
-          #   disk_profile: small
-          #   net_profile: default
-          # stacklight.telemetry:
-          #   cpu: 2
-          #   ram: 4096
-          #   disk_profile: xxlarge
-          #   net_profile: default
-      cluster:
-        internal:
-          node:
-            mdb01:
-              image: ${_param:salt_control_xenial_image}
-            mdb02:
-              image: ${_param:salt_control_xenial_image}
-            mdb03:
-              image: ${_param:salt_control_xenial_image}
-            ctl01:
-              image: ${_param:salt_control_xenial_image}
-            ctl02:
-              image: ${_param:salt_control_xenial_image}
-            ctl03:
-              image: ${_param:salt_control_xenial_image}
-            dbs01:
-              image: ${_param:salt_control_xenial_image}
-            dbs02:
-              image: ${_param:salt_control_xenial_image}
-            dbs03:
-              image: ${_param:salt_control_xenial_image}
-            msg01:
-              image: ${_param:salt_control_xenial_image}
-            msg02:
-              image: ${_param:salt_control_xenial_image}
-            msg03:
-              image: ${_param:salt_control_xenial_image}
-            prx01:
-              image: ${_param:salt_control_xenial_image}
-            prx02:
-              image: ${_param:salt_control_xenial_image}
-  virt:
-    nic:
-      default:
-        eth1:
-          bridge: br-mgmt
-          model: virtio
-        eth0:
-          bridge: br-ctl
-          model: virtio
-  glusterfs:
-    server:
-      volumes:
-        nova_instances:
-          storage: /srv/glusterfs/nova_instances
-          replica: 3
-          bricks:
-            - ${_param:cluster_node01_address}:/srv/glusterfs/nova_instances
-            - ${_param:cluster_node02_address}:/srv/glusterfs/nova_instances
-            - ${_param:cluster_node03_address}:/srv/glusterfs/nova_instances
-          options:
-            cluster.readdir-optimize: 'On'
-            nfs.disable: 'On'
-            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}