Merge "salt-master-init.sh: Use stable 2016.11 salt ver"

[fuel.git] / mcp / reclass / classes / cluster / baremetal-mcp-ocata-ovs-ha / infra / kvm.yml

diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/kvm.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/kvm.yml
index 5c33f9e..5c8026f 100644 (file)
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/kvm.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/kvm.yml
@@ -31,28 +31,28 @@ parameters:
       size: #RAM 4096,8192,16384,32768,65536
       ##Default production sizing
         openstack.control:
-          cpu: 6
-          ram: 8192
+          cpu: 4
+          ram: 10240
           disk_profile: small
           net_profile: default
         openstack.database:
-          cpu: 6
+          cpu: 4
           ram: 8192
           disk_profile: large
           net_profile: default
         openstack.message_queue:
-          cpu: 6
-          ram: 8192
+          cpu: 4
+          ram: 2048
           disk_profile: small
           net_profile: default
         openstack.telemetry:
-          cpu: 4
-          ram: 4096
+          cpu: 2
+          ram: 3072
           disk_profile: xxlarge
           net_profile: default
         openstack.proxy:
-          cpu: 4
-          ram: 4096
+          cpu: 2
+          ram: 2048
           disk_profile: small
           net_profile: default
 #        stacklight.log:
@@ -106,10 +106,10 @@ parameters:
   virt:
     nic:
       default:
-        eth0:
+        eth1:
           bridge: br-mgmt
           model: virtio
-        eth1:
+        eth0:
           bridge: br-ctl
           model: virtio
   linux: