Merge "Reduce number of workers"

manifests/aodh.pp

@@ -98,13 +98,18 @@ class openstack_integration::aodh (
     password => 'a_big_secret',
   }
   class { 'aodh::client': }
-  class { 'aodh::notifier': }
-  class { 'aodh::listener': }
+  class { 'aodh::notifier':
+    workers => 2,
+  }
+  class { 'aodh::listener':
+    workers => 2,
+  }
   class { 'aodh::coordination':
     backend_url => $::openstack_integration::config::tooz_url,
   }
   class { 'aodh::evaluator':
     evaluation_interval => 10,
+    workers             => 2,
   }
   class { 'aodh::expirer': }
 

manifests/ceilometer.pp

@@ -81,7 +81,7 @@ class openstack_integration::ceilometer (
       backend_url => $::openstack_integration::config::tooz_url,
     }
     class { 'ceilometer::agent::notification':
-      workers                   => '2',
+      workers                   => 2,
       manage_pipeline           => true,
       pipeline_publishers       => $sample_pipeline_publishers,
       manage_event_pipeline     => true,

manifests/designate.pp

@@ -86,18 +86,25 @@ class openstack_integration::designate {
     ssl_key   => "/etc/designate/ssl/private/${facts['networking']['fqdn']}.pem",
     ssl_cert  => $::openstack_integration::params::cert_path,
     ssl       => $::openstack_integration::config::ssl,
-    workers   => '2',
+    workers   => 2,
   }
 
   class { 'designate::mdns':
-    listen => "${::openstack_integration::config::ip_for_url}:5354"
+    listen  => "${::openstack_integration::config::ip_for_url}:5354",
+    workers => 2,
   }
 
-  class { 'designate::central': }
+  class { 'designate::central':
+    workers => 2,
+  }
 
-  class { 'designate::producer': }
+  class { 'designate::producer':
+    workers => 2,
+  }
 
-  class { 'designate::worker': }
+  class { 'designate::worker':
+    workers => 2,
+  }
 
   class { 'designate::backend::bind9':
     nameservers      => [$::openstack_integration::config::host],

manifests/ec2api.pp

@@ -63,11 +63,13 @@ class openstack_integration::ec2api {
         ec2api_use_ssl          => $::openstack_integration::config::ssl,
         ssl_cert_file           => $::openstack_integration::params::cert_path,
         ssl_key_file            => "/etc/ec2api/ssl/private/${facts['networking']['fqdn']}.pem",
+        ec2api_workers          => 2,
       }
       class { 'ec2api::metadata':
         nova_metadata_ip => $::openstack_integration::config::host,
         metadata_listen  => $::openstack_integration::config::host,
         metadata_use_ssl => $::openstack_integration::config::ssl,
+        metadata_workers => 2,
       }
     }
     'Debian': {

manifests/horizon.pp

@@ -57,6 +57,7 @@ class openstack_integration::horizon (
     ssl_key           => "/etc/openstack-dashboard/ssl/private/${facts['networking']['fqdn']}.pem",
     ssl_ca            => $::openstack_integration::params::ca_bundle_cert_path,
     ssl_verify_client => 'optional',
+    wsgi_processes    => 2,
     keystone_url      => $::openstack_integration::config::keystone_auth_uri,
     log_level         => 'DEBUG',
     # need to disable offline compression due to

manifests/magnum.pp

@@ -108,7 +108,9 @@ class openstack_integration::magnum (
     ssl_key_file  => $key_file
   }
 
-  class { 'magnum::conductor': }
+  class { 'magnum::conductor':
+    workers => 2,
+  }
   class { 'magnum::client': }
   class { 'magnum::certificates':
     cert_manager_type => $cert_manager_type

manifests/murano.pp

@@ -94,10 +94,13 @@ class openstack_integration::murano {
     key_file              => "/etc/murano/ssl/private/${facts['networking']['fqdn']}.pem",
   }
   class { 'murano::api':
-    host => $::openstack_integration::config::host,
+    host    => $::openstack_integration::config::host,
+    workers => 2,
   }
 
-  class { 'murano::engine': }
+  class { 'murano::engine':
+    workers => 2,
+  }
 
   class { 'murano::keystone::auth':
     public_url   => "${::openstack_integration::config::base_url}:8082",

manifests/nova.pp

@@ -176,21 +176,23 @@ class openstack_integration::nova (
     ssl_key   => "/etc/nova/ssl/private/${facts['networking']['fqdn']}.pem",
     ssl_cert  => $::openstack_integration::params::cert_path,
     ssl       => $::openstack_integration::config::ssl,
-    workers   => '2',
+    workers   => 2,
   }
   class { 'nova::wsgi::apache_metadata':
     bind_host => $::openstack_integration::config::host,
     ssl_key   => "/etc/nova/ssl/private/${facts['networking']['fqdn']}.pem",
     ssl_cert  => $::openstack_integration::params::cert_path,
     ssl       => $::openstack_integration::config::ssl,
-    workers   => '2',
+    workers   => 2,
   }
   class { 'nova::placement':
     auth_url => $::openstack_integration::config::keystone_admin_uri,
     password => 'a_big_secret',
   }
   class { 'nova::client': }
-  class { 'nova::conductor': }
+  class { 'nova::conductor':
+    workers => 2,
+  }
   class { 'nova::cron::archive_deleted_rows': }
   if $volume_encryption {
     class { 'nova::key_manager':
@@ -257,7 +259,9 @@ class openstack_integration::nova (
     include openstacklib::iscsid
     Service['iscsid'] -> Service['nova-compute']
   }
-  class { 'nova::scheduler': }
+  class { 'nova::scheduler':
+    workers => 2,
+  }
   class { 'nova::scheduler::filter': }
   class { 'nova::vncproxy':
     host => $::openstack_integration::config::host

manifests/octavia.pp

@@ -205,8 +205,11 @@ class openstack_integration::octavia (
   }
 
   class { 'octavia::worker':
+    workers => 2,
   }
   class { 'octavia::health_manager':
+    health_update_threads => 2,
+    stats_update_threads  => 2,
   }
   class { 'octavia::housekeeping':
   }

manifests/placement.pp

@@ -68,7 +68,7 @@ class openstack_integration::placement {
       ssl_key   => "/etc/placement/ssl/private/${facts['networking']['fqdn']}.pem",
       ssl_cert  => $::openstack_integration::params::cert_path,
       ssl       => $::openstack_integration::config::ssl,
-      workers   => '2',
+      workers   => 2,
     }
   }
 }

manifests/qdr.pp

@@ -51,5 +51,6 @@ class openstack_integration::qdr {
     listener_sasl_mech     => 'PLAIN',
     listener_auth_peer     => true,
     extra_addresses        => $extra_addresses,
+    router_worker_threads  => 2,
   }
 }

manifests/swift.pp

@@ -49,7 +49,7 @@ class openstack_integration::swift {
   # proxy server
   class { 'swift::proxy':
     proxy_local_net_ip => $::openstack_integration::config::host,
-    workers            => '2',
+    workers            => 2,
     pipeline           => [
   'catch_errors', 'gatekeeper', 'healthcheck', 'proxy-logging', 'cache',
   'listing_formats', 'container_sync', 'bulk', 'tempurl', 'ratelimit',
@@ -136,11 +136,14 @@ class openstack_integration::swift {
 
   # storage servers
   class { 'swift::storage::all':
-    storage_local_net_ip => $::openstack_integration::config::host,
-    mount_check          => false,
-    account_pipeline     => ['healthcheck', 'recon', 'account-server'],
-    container_pipeline   => ['healthcheck', 'recon', 'container-server'],
-    object_pipeline      => ['healthcheck', 'recon', 'object-server'],
+    storage_local_net_ip     => $::openstack_integration::config::host,
+    mount_check              => false,
+    account_pipeline         => ['healthcheck', 'recon', 'account-server'],
+    container_pipeline       => ['healthcheck', 'recon', 'container-server'],
+    object_pipeline          => ['healthcheck', 'recon', 'object-server'],
+    account_server_workers   => 2,
+    container_server_workers => 2,
+    object_server_workers    => 2,
   }
   $swift_components = ['account', 'container', 'object']
   swift::storage::filter::recon { $swift_components : }

manifests/watcher.pp

@@ -90,10 +90,10 @@ class openstack_integration::watcher {
     workers   => 2,
   }
   class { 'watcher::applier':
-    applier_workers => '2',
+    applier_workers => 2,
   }
   class { 'watcher::decision_engine':
-    decision_engine_workers => '2',
+    decision_engine_workers => 2,
   }
   class { 'watcher::cron::db_purge': }