From 67aee9f8a22c7d9e319248e877e5131170be0f07 Mon Sep 17 00:00:00 2001
From: jangseon ryu <jangseon.ryu@navercorp.com>
Date: Fri, 3 Feb 2017 20:52:10 +0000
Subject: [PATCH] This feature is supporting for workers config in swift
servers.
Currently it doesn't work in swift servers such as proxy-server,
object-server, account-server and container-server, in spite of
setting openstack_service_workers config in globals.yml.
Because it's not implement about workers in swift.
Closes-Bug: #1662751
Change-Id: Iae9a12952cd3fe285eed3d8fca2e667a68de15c7
Signed-off-by: jangseon ryu <jangseon.ryu@navercorp.com>
---
ansible/roles/swift/templates/account.conf.j2 | 1 +
ansible/roles/swift/templates/container.conf.j2 | 1 +
ansible/roles/swift/templates/object.conf.j2 | 1 +
ansible/roles/swift/templates/proxy-server.conf.j2 | 1 +
4 files changed, 4 insertions(+)
diff --git a/ansible/roles/swift/templates/account.conf.j2 b/ansible/roles/swift/templates/account.conf.j2
index 753423db96..00606ea3ff 100644
--- a/ansible/roles/swift/templates/account.conf.j2
+++ b/ansible/roles/swift/templates/account.conf.j2
@@ -8,6 +8,7 @@ log_udp_port = {{ fluentd_syslog_port }}
log_name = {{ service_name }}
log_facility = LOG_LOCAL0
log_level = INFO
+workers = {{ openstack_service_workers }}
[pipeline:main]
pipeline = account-server
diff --git a/ansible/roles/swift/templates/container.conf.j2 b/ansible/roles/swift/templates/container.conf.j2
index 6867ca8499..1d8df62aec 100644
--- a/ansible/roles/swift/templates/container.conf.j2
+++ b/ansible/roles/swift/templates/container.conf.j2
@@ -8,6 +8,7 @@ log_udp_port = {{ fluentd_syslog_port }}
log_name = {{ service_name }}
log_facility = LOG_LOCAL0
log_level = INFO
+workers = {{ openstack_service_workers }}
[pipeline:main]
pipeline = container-server
diff --git a/ansible/roles/swift/templates/object.conf.j2 b/ansible/roles/swift/templates/object.conf.j2
index 6fa1c77d1a..2629e3f367 100644
--- a/ansible/roles/swift/templates/object.conf.j2
+++ b/ansible/roles/swift/templates/object.conf.j2
@@ -9,6 +9,7 @@ log_udp_port = {{ fluentd_syslog_port }}
log_name = {{ service_name }}
log_facility = LOG_LOCAL0
log_level = INFO
+workers = {{ openstack_service_workers }}
[pipeline:main]
{% if service_name == 'swift-object-expirer' %}
diff --git a/ansible/roles/swift/templates/proxy-server.conf.j2 b/ansible/roles/swift/templates/proxy-server.conf.j2
index 6177700f89..cd8a8db2f8 100644
--- a/ansible/roles/swift/templates/proxy-server.conf.j2
+++ b/ansible/roles/swift/templates/proxy-server.conf.j2
@@ -7,6 +7,7 @@ log_udp_port = {{ fluentd_syslog_port }}
log_name = {{ service_name }}
log_facility = LOG_LOCAL0
log_level = INFO
+workers = {{ openstack_service_workers }}
[pipeline:main]
pipeline = catch_errors gatekeeper healthcheck cache container_sync bulk ratelimit authtoken keystoneauth slo dlo proxy-server