Merge "Rework processorcount limits to os_workers"

[fuel.git] / build / f_repos / patch / fuel-library / 0001-Reduce-ceilometer-memory-usage.patch

diff --git a/build/f_repos/patch/fuel-library/0001-Reduce-ceilometer-memory-usage.patch b/build/f_repos/patch/fuel-library/0001-Reduce-ceilometer-memory-usage.patch
index e51e70b..a1ee036 100644 (file)
--- a/build/f_repos/patch/fuel-library/0001-Reduce-ceilometer-memory-usage.patch
+++ b/build/f_repos/patch/fuel-library/0001-Reduce-ceilometer-memory-usage.patch
@@ -1,18 +1,19 @@
+From 3c0a101279ef225c6d14b13a5424d0d190df1079 Mon Sep 17 00:00:00 2001
 From: Michael Polenchuk <mpolenchuk@mirantis.com>
-Date: Thu, 8 Sep 2016 19:25:14 +0300
+Date: Mon, 19 Dec 2016 16:03:37 +0400
 Subject: [PATCH] Reduce ceilometer memory usage
 
-Change-Id: I8b1a97bd710c859a3543d1aed8226313f35f4f10
+Change-Id: I11045c233eeb833108ffdee4a8952cd61b91c840
 ---
  .../puppet/openstack_tasks/manifests/ceilometer/controller.pp      | 7 +++++++
  1 file changed, 7 insertions(+)
 
 diff --git a/deployment/puppet/openstack_tasks/manifests/ceilometer/controller.pp b/deployment/puppet/openstack_tasks/manifests/ceilometer/controller.pp
-index 2c63ff0..1dda109 100644
+index f531b617d..7f811f276 100644
 --- a/deployment/puppet/openstack_tasks/manifests/ceilometer/controller.pp
 +++ b/deployment/puppet/openstack_tasks/manifests/ceilometer/controller.pp
-@@ -234,5 +234,12 @@ class openstack_tasks::ceilometer::controller {
-         Ceilometer_config<| title == 'oslo_messaging_rabbit/kombu_compression' |> { value => $kombu_compression }
+@@ -243,5 +243,12 @@ class openstack_tasks::ceilometer::controller {
+         'DEFAULT/use_syslog_rfc_format': value => true;
        }
      }
 +
@@ -20,7 +21,10 @@ index 2c63ff0..1dda109 100644
 +    ceilometer_config {
 +      'DEFAULT/executor_thread_pool_size':               value => ceiling($service_workers*0.5);
 +      'notification/pipeline_processing_queues':         value => ceiling($service_workers*1.5);
-+      'oslo_messaging_rabbit/rabbit_qos_prefetch_count': value => 5;
++      'oslo_messaging_rabbit/rabbit_qos_prefetch_count': value => 100;
 +    }
    }
  }
+-- 
+2.11.0
+