From: Jenkins <jenkins@review.openstack.org>
Date: Fri, 20 Nov 2015 20:21:03 +0000 (+0000)
Subject: Merge "Change default host reserved memory to 2048MB from 512MB"
X-Git-Tag: opnfv-6.0.0~2295
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=17c0f43894ff1ff4d7d8392f4ee1cc129431453c;p=apex-tripleo-heat-templates.git

Merge "Change default host reserved memory to 2048MB from 512MB"
---

17c0f43894ff1ff4d7d8392f4ee1cc129431453c
diff --cc puppet/hieradata/compute.yaml
index 173020f8,8858fd6f..fa8dcc81
--- a/puppet/hieradata/compute.yaml
+++ b/puppet/hieradata/compute.yaml
@@@ -10,9 -10,17 +10,15 @@@ nova::compute::vnc_enabled: tru
  nova::compute::libvirt::vncserver_listen: '0.0.0.0'
  nova::compute::libvirt::migration_support: true
  
 -nova::compute::rbd::libvirt_rbd_user: 'openstack'
 -nova::compute::rbd::rbd_keyring: 'client.openstack'
 -nova::compute::rbd::libvirt_images_rbd_pool: 'vms'
  nova::compute::rbd::libvirt_rbd_secret_uuid: "%{hiera('ceph::profile::params::fsid')}"
  
+ # Changing the default from 512MB. The current templates can not deploy
+ # overclouds with swap. On an idle compute node, we see ~1024MB of RAM
+ # used. 2048 is suggested to account for other possible operations for
+ # example openvswitch.
+ nova::compute::reserved_host_memory: 2048
+ 
  ceilometer::agent::auth::auth_tenant_name: 'service'
 +ceilometer::agent::auth::auth_endpoint_type: 'internalURL'
  
  compute_classes: []