Update container-sync to use internal client

This is to match the way this is configured in upstream Swift.

Change-Id: Ifbfd4158e04f38bf3383a7c2461374a21088fdd3
This commit is contained in:
Andy McCrae 2017-04-03 15:01:29 +01:00 committed by Andy McCrae
parent d62d6a23ac
commit 78b4f6aac6
5 changed files with 38 additions and 0 deletions

@ -476,6 +476,7 @@ swift_container_reconciler_conf_overrides: {}
swift_container_server_replicator_conf_overrides: {}
swift_container_sync_realms_conf_overrides: {}
swift_drive_audit_conf_overrides: {}
swift_internal_client_conf_overrides: {}
swift_object_server_conf_overrides: {}
swift_object_expirer_conf_overrides: {}
swift_object_server_replicator_conf_overrides: {}

@ -0,0 +1,7 @@
---
features:
- Swift container-sync has been updated to use
``internal-client``. This means a new configuration
file ``internal-client.conf`` has been added.
Configuration can be overridden using the variable
``swift_internal_client_conf_overrides``.

@ -31,6 +31,10 @@
dest: "/etc/swift/container-server/container-reconciler.conf"
config_overrides: "{{ swift_container_reconciler_conf_overrides }}"
config_type: "ini"
- src: "internal-client.conf.j2"
dest: "/etc/swift/container-server/internal-client.conf"
config_overrides: "{{ swift_internal_client_conf_overrides }}"
config_type: "ini"
notify: Restart swift services
# If we've specified a container-sync realm use container-sync-realms.conf

@ -58,6 +58,7 @@ node_timeout = 15
conn_timeout = 5
[container-sync]
internal_client_conf_path = /etc/swift/container-server/internal-client.conf
[filter:xprofile]
use = egg:swift#xprofile

@ -0,0 +1,25 @@
[DEFAULT]
log_facility = LOG_LOCAL3
{% set _statsd_host = swift_vars.statsd_host | default(swift.statsd_host | default(statsd_host | default(False))) %}
{% if _statsd_host | bool %}
log_statsd_host = {{ _statsd_host }}
log_statsd_port = {{ swift_vars.statsd_port | default(swift.statsd_port | default(statsd_port)) }}
log_statsd_default_sample_rate = {{ swift_vars.statsd_default_sample_rate | default(swift.statsd_default_sample_rate | default(statsd_default_sample_rate)) }}
log_statsd_sample_rate_factor = {{ swift_vars.statsd_sample_rate_factor | default(swift.statsd_sample_rate_factor | default(statsd_sample_rate_factor))}}
log_statsd_metric_prefix = {{ swift_vars.statsd_metric_prefix | default(swift.statsd_metric_prefix | default(inventory_hostname)) }}
{% endif %}
[pipeline:main]
pipeline = catch_errors proxy-logging cache proxy-server
[app:proxy-server]
use = egg:swift#proxy
[filter:cache]
use = egg:swift#memcache
[filter:proxy-logging]
use = egg:swift#proxy_logging
[filter:catch_errors]
use = egg:swift#catch_errors