From eafd3a59af91b7da0b2409bff86db4292bd03cf9 Mon Sep 17 00:00:00 2001
From: Michal Arbet <michal.arbet@ultimum.io>
Date: Tue, 24 May 2022 13:13:08 +0200
Subject: [PATCH] Remove configuration related to api_workers

This patch is removing api related configuration
from service's config files as we are using
apache mod_wsgi and this configuration is not
used.

Change-Id: I69a1542a6f24214fbf6e703782aefb566de4fb26
---
 ansible/roles/cinder/templates/cinder.conf.j2      |  4 ----
 ansible/roles/heat/templates/heat.conf.j2          | 14 --------------
 .../roles/placement/templates/placement.conf.j2    |  2 --
 ansible/roles/vitrage/templates/vitrage.conf.j2    |  5 -----
 ansible/roles/zun/templates/zun.conf.j2            |  5 -----
 5 files changed, 30 deletions(-)

diff --git a/ansible/roles/cinder/templates/cinder.conf.j2 b/ansible/roles/cinder/templates/cinder.conf.j2
index 3149bc352f..4f37fccb21 100644
--- a/ansible/roles/cinder/templates/cinder.conf.j2
+++ b/ansible/roles/cinder/templates/cinder.conf.j2
@@ -13,7 +13,6 @@ use_stderr = False
 
 my_ip = {{ api_interface_address }}
 
-osapi_volume_workers = {{ openstack_service_workers }}
 volume_name_template = volume-%s
 
 glance_api_servers = {{ glance_internal_endpoint }}
@@ -51,9 +50,6 @@ backup_swift_key =
 {% endif %}
 {% endif %}
 
-osapi_volume_listen = {{ api_interface_address }}
-osapi_volume_listen_port = {{ cinder_api_listen_port }}
-
 api_paste_config = /etc/cinder/api-paste.ini
 
 auth_strategy = keystone
diff --git a/ansible/roles/heat/templates/heat.conf.j2 b/ansible/roles/heat/templates/heat.conf.j2
index b9cb32910c..ca954cf403 100644
--- a/ansible/roles/heat/templates/heat.conf.j2
+++ b/ansible/roles/heat/templates/heat.conf.j2
@@ -22,20 +22,6 @@ region_name_for_services = {{ openstack_region_name }}
 
 server_keystone_endpoint_type = public
 
-{% if service_name == 'heat-api' %}
-[heat_api]
-bind_host = {{ api_interface_address }}
-bind_port = {{ heat_api_listen_port }}
-workers = {{ openstack_service_workers }}
-{% endif %}
-
-{% if service_name == 'heat-api-cfn' %}
-[heat_api_cfn]
-bind_host = {{ api_interface_address }}
-bind_port = {{ heat_api_cfn_listen_port }}
-workers = {{ openstack_service_workers }}
-{% endif %}
-
 [database]
 connection = mysql+pymysql://{{ heat_database_user }}:{{ heat_database_password }}@{{ heat_database_address }}/{{ heat_database_name }}
 connection_recycle_time = {{ database_connection_recycle_time }}
diff --git a/ansible/roles/placement/templates/placement.conf.j2 b/ansible/roles/placement/templates/placement.conf.j2
index bb788a7cd1..6ad463547f 100644
--- a/ansible/roles/placement/templates/placement.conf.j2
+++ b/ansible/roles/placement/templates/placement.conf.j2
@@ -5,8 +5,6 @@ log_dir = /var/log/kolla/placement
 
 state_path = /var/lib/placement
 
-osapi_compute_listen = {{ api_interface_address }}
-
 # Though my_ip is not used directly, lots of other variables use $my_ip
 my_ip = {{ api_interface_address }}
 
diff --git a/ansible/roles/vitrage/templates/vitrage.conf.j2 b/ansible/roles/vitrage/templates/vitrage.conf.j2
index 4fac689c34..07b442afd6 100644
--- a/ansible/roles/vitrage/templates/vitrage.conf.j2
+++ b/ansible/roles/vitrage/templates/vitrage.conf.j2
@@ -13,11 +13,6 @@ notifiers = {{ vitrage_notifiers|map(attribute='name')|join(',') }}
 
 transport_url = {{ rpc_transport_url }}
 
-[api]
-host = {{ api_interface_address }}
-port = {{ vitrage_api_port }}
-workers = {{ openstack_service_workers }}
-
 [database]
 connection = mysql+pymysql://{{ vitrage_database_user }}:{{ vitrage_database_password }}@{{ vitrage_database_address }}/{{ vitrage_database_name }}
 connection_recycle_time = {{ database_connection_recycle_time }}
diff --git a/ansible/roles/zun/templates/zun.conf.j2 b/ansible/roles/zun/templates/zun.conf.j2
index 2553324959..3dc4d1c8e1 100644
--- a/ansible/roles/zun/templates/zun.conf.j2
+++ b/ansible/roles/zun/templates/zun.conf.j2
@@ -16,11 +16,6 @@ capsule_driver = cri
 [network]
 driver = kuryr
 
-[api]
-host_ip = {{ api_interface_address }}
-port = {{ zun_api_port }}
-workers = {{ openstack_service_workers }}
-
 [database]
 connection = mysql+pymysql://{{ zun_database_user }}:{{ zun_database_password }}@{{ zun_database_address }}/{{ zun_database_name }}
 connection_recycle_time = {{ database_connection_recycle_time }}