Add api_workers for each service to defaults

Render {{ openstack_service_workers }} for workers
of each openstack service is not enough. There are
several services which has to have more workers because
there are more requests sent to them.

This patch is just adding default value for workers for
each service and sets {{ openstack_service_workers }} as
default, so value can be overrided in hostvars per server.
Nothing changed for normal user.

Change-Id: Ifa5863f8ec865bbf8e39c9b2add42c92abe40616

ansible/roles/aodh/defaults/main.yml

@@ -196,6 +196,7 @@ aodh_keystone_user: "aodh"
 
 openstack_aodh_auth: "{{ openstack_auth }}"
 
+aodh_api_workers: "{{ openstack_service_workers }}"
 
 ####################
 # Kolla

ansible/roles/aodh/templates/wsgi-aodh.conf.j2

@@ -32,7 +32,7 @@ LogLevel info
   LogFormat "%{X-Forwarded-For}i %l %u %t \"%r\" %>s %b %D \"%{Referer}i\" \"%{User-Agent}i\"" logformat
   CustomLog "{{ aodh_log_dir }}/aodh_wsgi_access.log" logformat
   WSGIApplicationGroup %{GLOBAL}
-  WSGIDaemonProcess aodh group=aodh processes={{ openstack_service_workers }} threads=1 user=aodh
+  WSGIDaemonProcess aodh group=aodh processes={{ aodh_api_workers }} threads=1 user=aodh
   WSGIProcessGroup aodh
   WSGIScriptAlias / "{{ binary_path }}/aodh-api"
 </VirtualHost>

ansible/roles/barbican/defaults/main.yml

@@ -147,6 +147,7 @@ barbican_audit_role: "audit"
 
 openstack_barbican_auth: "{{ openstack_auth }}"
 
+barbican_api_workers: "{{ openstack_service_workers }}"
 
 ####################
 # Kolla

ansible/roles/barbican/templates/barbican-api.ini.j2

@@ -4,7 +4,7 @@ https-socket = {{ api_interface_address | put_address_in_context('url') }}:{{ ba
 {% else %}
 http-socket = {{ api_interface_address | put_address_in_context('url') }}:{{ barbican_api_listen_port }}
 {% endif %}
-processes = {{ openstack_service_workers }}
+processes = {{ barbican_api_workers }}
 lazy = true
 vacuum = true
 no-default-app = true

ansible/roles/cinder/defaults/main.yml

@@ -207,6 +207,7 @@ openstack_cinder_auth: "{{ openstack_auth }}"
 # allow room for slowness.
 cinder_rpc_version_startup_delay: 30
 
+cinder_api_workers: "{{ openstack_service_workers }}"
 
 ####################
 # Cinder

ansible/roles/cinder/templates/cinder-wsgi.conf.j2

@@ -18,7 +18,7 @@ LogLevel info
 {% endif %}
 
 <VirtualHost *:{{ cinder_api_listen_port }}>
-    WSGIDaemonProcess cinder-api processes={{ openstack_service_workers }} threads=1 user=cinder group=cinder display-name=cinder-api
+    WSGIDaemonProcess cinder-api processes={{ cinder_api_workers }} threads=1 user=cinder group=cinder display-name=cinder-api
     WSGIProcessGroup cinder-api
     WSGIScriptAlias / /var/www/cgi-bin/cinder/cinder-wsgi
     WSGIApplicationGroup %{GLOBAL}

ansible/roles/cloudkitty/defaults/main.yml

@@ -108,6 +108,8 @@ cloudkitty_keystone_user: "cloudkitty"
 
 openstack_cloudkitty_auth: "{{ openstack_auth }}"
 
+cloudkitty_api_workers: "{{ openstack_service_workers }}"
+cloudkitty_processor_workers: "{{ openstack_service_workers }}"
 
 ####################
 # Cloudkitty

ansible/roles/cloudkitty/templates/cloudkitty.conf.j2

@@ -90,7 +90,7 @@ port = {{ cloudkitty_api_port }}
 
 [orchestrator]
 coordination_url = mysql://{{ cloudkitty_database_user }}:{{ cloudkitty_database_password }}@{{ cloudkitty_database_address }}/{{ cloudkitty_database_name }}
-max_workers = {{ openstack_service_workers }}
+max_workers = {{ cloudkitty_processor_workers }}
 
 [storage]
 backend = {{ cloudkitty_storage_backend }}

ansible/roles/cloudkitty/templates/wsgi-cloudkitty.conf.j2

@@ -23,7 +23,7 @@ LogLevel info
   LogFormat "%{X-Forwarded-For}i %l %u %t \"%r\" %>s %b %D \"%{Referer}i\" \"%{User-Agent}i\"" logformat
   CustomLog "{{ cloudkitty_log_dir }}/cloudkitty-api-access.log" logformat
   WSGIApplicationGroup %{GLOBAL}
-  WSGIDaemonProcess cloudkitty group=cloudkitty processes={{ openstack_service_workers }} threads=1 user=cloudkitty
+  WSGIDaemonProcess cloudkitty group=cloudkitty processes={{ cloudkitty_api_workers }} threads=1 user=cloudkitty
   WSGIProcessGroup cloudkitty
   WSGIScriptAlias / "{{ binary_path }}/cloudkitty-api"
 

ansible/roles/designate/defaults/main.yml

@@ -270,6 +270,12 @@ designate_logging_debug: "{{ openstack_logging_debug }}"
 
 openstack_designate_auth: "{{ openstack_auth }}"
 
+designate_api_workers: "{{ openstack_service_workers }}"
+designate_worker_workers: "{{ openstack_service_workers }}"
+designate_producer_workers: "{{ openstack_service_workers }}"
+designate_central_workers: "{{ openstack_service_workers }}"
+designate_sink_workers: "{{ openstack_service_workers }}"
+designate_mdns_workers: "{{ openstack_service_workers }}"
 
 ####################
 # Kolla

ansible/roles/designate/templates/designate.conf.j2

@@ -8,12 +8,12 @@ transport_url = {{ rpc_transport_url }}
 
 [service:central]
 default_pool_id = {{ designate_pool_id }}
-workers = {{ openstack_service_workers }}
+workers = {{ designate_central_workers }}
 
 [service:api]
 listen = {{ api_interface_address | put_address_in_context('url') }}:{{ designate_api_listen_port }}
 api_base_uri = {{ designate_internal_endpoint }}
-workers = {{ openstack_service_workers }}
+workers = {{ designate_api_workers }}
 enable_api_admin = True
 enable_host_header = True
 enabled_extensions_admin = quotas, reports
@@ -40,14 +40,14 @@ memcached_servers = {% for host in groups['memcached'] %}{{ 'api' | kolla_addres
 {% if service_name == 'designate-mdns' %}
 [service:mdns]
 listen = {{ 'dns' | kolla_address | put_address_in_context('url') }}:{{ designate_mdns_port }}
-workers = {{ openstack_service_workers }}
+workers = {{ designate_mdns_workers }}
 {% endif %}
 
 [service:worker]
-workers = {{ openstack_service_workers }}
+workers = {{ designate_worker_workers }}
 
 [service:producer]
-workers = {{ openstack_service_workers }}
+workers = {{ designate_producer_workers }}
 threads = 1000
 enabled_tasks = None
 
@@ -62,7 +62,7 @@ idle_timeout = 3600
 {% if service_name == 'designate-sink' and designate_enable_notifications_sink | bool %}
 [service:sink]
 enabled_notification_handlers = nova_fixed, neutron_floatingip
-workers = {{ openstack_service_workers }}
+workers = {{ designate_sink_workers }}
 
 [handler:nova_fixed]
 #NOTE: zone_id must be manually filled an ID from openstack zone list

ansible/roles/freezer/defaults/main.yml

@@ -85,6 +85,7 @@ freezer_keystone_user: "freezer"
 
 openstack_freezer_auth: "{{ openstack_auth }}"
 
+freezer_api_workers: "{{ openstack_service_workers }}"
 
 ####################
 # Kolla

ansible/roles/freezer/templates/wsgi-freezer-api.conf.j2

@@ -18,7 +18,7 @@ LogLevel info
 {% endif %}
 
 <VirtualHost *:{{ freezer_api_port }}>
-    WSGIDaemonProcess freezer-api processes={{ openstack_service_workers }} threads=1 user=freezer display-name=freezer-api
+    WSGIDaemonProcess freezer-api processes={{ freezer_api_workers }} threads=1 user=freezer display-name=freezer-api
     WSGIProcessGroup freezer-api
     WSGIApplicationGroup %{GLOBAL}
     WSGIScriptAlias / {{ python_path }}/freezer_api/cmd/wsgi.py

ansible/roles/glance/defaults/main.yml

@@ -209,6 +209,8 @@ glance_logging_debug: "{{ openstack_logging_debug }}"
 
 openstack_glance_auth: "{{ openstack_auth }}"
 
+glance_api_workers: "{{ openstack_service_workers }}"
+
 ###################
 # Kolla
 ###################

ansible/roles/glance/templates/glance-api.conf.j2

@@ -11,7 +11,7 @@ bind_host = 127.0.0.1
 bind_host = {{ api_interface_address }}
 {% endif %}
 bind_port = {{ glance_api_listen_port }}
-workers = {{ openstack_service_workers }}
+workers = {{ glance_api_workers }}
 
 {% if glance_store_backends %}
 enabled_backends = {% for key in glance_store_backends %}{{ key.name }}:{{ key.type }}{% if not loop.last %}, {% endif %}{% endfor %}

ansible/roles/gnocchi/defaults/main.yml

@@ -152,6 +152,8 @@ gnocchi_keystone_user: "gnocchi"
 
 openstack_gnocchi_auth: "{{ openstack_auth }}"
 
+gnocchi_api_workers: "{{ openstack_service_workers }}"
+
 ####################
 # Keystone
 ####################

ansible/roles/gnocchi/templates/wsgi-gnocchi.conf.j2

@@ -23,7 +23,7 @@ LogLevel info
   LogFormat "%{X-Forwarded-For}i %l %u %t \"%r\" %>s %b %D \"%{Referer}i\" \"%{User-Agent}i\"" logformat
   CustomLog "{{ gnocchi_log_dir }}/gnocchi-api-access.log" logformat
   WSGIApplicationGroup %{GLOBAL}
-  WSGIDaemonProcess gnocchi group=gnocchi processes={{ openstack_service_workers }} threads=1 user=gnocchi
+  WSGIDaemonProcess gnocchi group=gnocchi processes={{ gnocchi_api_workers }} threads=1 user=gnocchi
   WSGIProcessGroup gnocchi
   WSGIScriptAlias / "{{ wsgi_path }}/gnocchi-api"
 

ansible/roles/heat/defaults/main.yml

@@ -166,6 +166,9 @@ heat_stack_owner_role: "heat_stack_owner"
 
 openstack_heat_auth: "{{ openstack_auth }}"
 
+heat_api_cfn_workers: "{{ openstack_service_workers }}"
+heat_api_workers: "{{ openstack_service_workers }}"
+heat_engine_workers: "{{ openstack_service_workers }}"
 
 ####################
 # Kolla

ansible/roles/heat/templates/heat.conf.j2

@@ -13,7 +13,7 @@ stack_domain_admin_password = {{ heat_domain_admin_password }}
 stack_user_domain_name = heat_user_domain
 
 {% if service_name == 'heat-engine' %}
-num_engine_workers = {{ openstack_service_workers }}
+num_engine_workers = {{ heat_engine_workers }}
 {% endif %}
 
 transport_url = {{ rpc_transport_url }}

ansible/roles/heat/templates/wsgi-heat-api-cfn.conf.j2

@@ -29,7 +29,7 @@ CustomLog "{{ heat_log_dir }}/apache-cfn-access.log" common
 </IfModule>
 
 <VirtualHost *:{{ heat_api_cfn_listen_port }}>
-    WSGIDaemonProcess heat-api-cfn processes={{ openstack_service_workers }} threads=1 user=heat group=heat display-name=heat-api-cfn
+    WSGIDaemonProcess heat-api-cfn processes={{ heat_api_cfn_workers }} threads=1 user=heat group=heat display-name=heat-api-cfn
     WSGIProcessGroup heat-api-cfn
     WSGIScriptAlias / {{ binary_path }}/heat-wsgi-api-cfn
     WSGIApplicationGroup %{GLOBAL}