X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=mcp%2Freclass%2Fclasses%2Fcluster%2Fbaremetal-mcp-ocata-odl-ha%2Finfra%2Fkvm.yml;h=01e4a6b995ad1bb13af6524fd4371cebaa0171dd;hb=2050647bd70043be2eb90a45b7173a25570b8c8d;hp=f73d48e7a8d4cd9ca3cffa24cf47bde4f5a9d0e6;hpb=a1a413ad65c31ebf5dc42924f7ed04ab02a04872;p=fuel.git

diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/kvm.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/kvm.yml
index f73d48e7a..01e4a6b99 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/kvm.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/kvm.yml
@@ -1,75 +1,19 @@
+##############################################################################
+# 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
-- system.linux.system.repo.saltstack.xenial
-- 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-odl-ha.infra
+  - cluster.baremetal-mcp-ocata-common-ha.infra.kvm
+  - cluster.baremetal-mcp-ocata-odl-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: enp6s0
   salt:
     control:
-      size: #RAM 4096,8192,16384,32768,65536
-      ##Default production sizing
-        openstack.control:
-          cpu: 4
-          ram: 10240
-          disk_profile: small
-          net_profile: default
-        openstack.database:
-          cpu: 4
-          ram: 8192
-          disk_profile: large
-          net_profile: default
-        openstack.message_queue:
-          cpu: 4
-          ram: 2048
-          disk_profile: small
-          net_profile: default
-#        openstack.telemetry:
-#          cpu: 4
-#          ram: 4096
-#          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
+      size:  # RAM 4096,8192,16384,32768,65536
+        # Default production sizing
         opendaylight.server:
           cpu: 4
           ram: 6144
@@ -83,76 +27,3 @@ parameters:
               provider: ${_param:infra_kvm_node03_hostname}.${_param:cluster_domain}
               image: ${_param:salt_control_xenial_image}
               size: opendaylight.server
-#            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
-  linux:
-    network:
-      interface:
-        eth3:
-          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:
-          - 8.8.8.8
-          - 8.8.4.4
-          use_interfaces:
-          - ${_param:deploy_nic}
-          noifupdown: true
-        vlan300:
-          enabled: true
-          proto: manual
-          type: vlan
-          name: ${_param:deploy_nic}.300
-          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}.300