From 6140ae6fc3c1742e11660494b96f88c368d301d6 Mon Sep 17 00:00:00 2001 From: Emilien Macchi Date: Wed, 24 Feb 2016 12:36:11 -0500 Subject: [PATCH] Reduce number of workers to 2 when possible Reducing workers will help us to consume less memory reduce the number of timeouts we have in upstream CI. * Neutron & Swift: reduce from 4 to 2 workers * When possible, set workers to 2: aodh, ceilometer, gnocchi. Change-Id: Ie064a9ad0389f112bbb69f4253f7f6dbc26deb0a --- manifests/aodh.pp | 3 ++- manifests/ceilometer.pp | 8 ++++++-- manifests/gnocchi.pp | 3 ++- manifests/neutron.pp | 3 ++- manifests/swift.pp | 2 +- 5 files changed, 13 insertions(+), 6 deletions(-) diff --git a/manifests/aodh.pp b/manifests/aodh.pp index bf57da303..a03b16416 100644 --- a/manifests/aodh.pp +++ b/manifests/aodh.pp @@ -44,7 +44,8 @@ class openstack_integration::aodh { service_name => 'httpd', } class { '::aodh::wsgi::apache': - ssl => false, + workers => 2, + ssl => false, } class { '::aodh::auth': auth_url => 'http://127.0.0.1:5000/v2.0', diff --git a/manifests/ceilometer.pp b/manifests/ceilometer.pp index ffa31dcb1..b43f9075c 100644 --- a/manifests/ceilometer.pp +++ b/manifests/ceilometer.pp @@ -41,9 +41,13 @@ class openstack_integration::ceilometer { ssl => false, workers => '2', } - class { '::ceilometer::collector': } + class { '::ceilometer::collector': + collector_workers => '2', + } class { '::ceilometer::expirer': } - class { '::ceilometer::agent::notification': } + class { '::ceilometer::agent::notification': + notification_workers => '2', + } class { '::ceilometer::agent::polling': } class { '::ceilometer::agent::auth': auth_password => 'a_big_secret', diff --git a/manifests/gnocchi.pp b/manifests/gnocchi.pp index 70f67ed87..dd5ecdf19 100644 --- a/manifests/gnocchi.pp +++ b/manifests/gnocchi.pp @@ -23,7 +23,8 @@ class openstack_integration::gnocchi { } include ::apache class { '::gnocchi::wsgi::apache': - ssl => false, + workers => 2, + ssl => false, } class { '::gnocchi::client': } class { '::gnocchi::db::sync': } diff --git a/manifests/neutron.pp b/manifests/neutron.pp index a99fcafbf..df5957145 100644 --- a/manifests/neutron.pp +++ b/manifests/neutron.pp @@ -36,7 +36,8 @@ class openstack_integration::neutron { auth_password => 'a_big_secret', identity_uri => 'http://127.0.0.1:35357/', sync_db => true, - api_workers => 4, + api_workers => 2, + rpc_workers => 2, } class { '::neutron::plugins::ml2': type_drivers => ['vxlan'], diff --git a/manifests/swift.pp b/manifests/swift.pp index a6af5b95d..d51a19176 100644 --- a/manifests/swift.pp +++ b/manifests/swift.pp @@ -6,7 +6,7 @@ class openstack_integration::swift { } class { '::swift::proxy': proxy_local_net_ip => '127.0.0.1', - workers => '4', + workers => '2', pipeline => [ 'catch_errors', 'healthcheck', 'cache', 'tempurl', 'ratelimit', 'authtoken', 'keystone', 'formpost', 'staticweb', 'container_quotas',