176107aa30
The Swift configuration item [filter:recon]/recon_lock_path is set to '/var/lock/swift' by openstack-ansible in the appropriate configuration files. The playbooks also create the directory if it does not exist. If the host is rebooted the directory '/var/lock/swift' is missing and must be recreated. /var/lock (/run/lock) is a tmpfs and so the directory /var/lock/swift will not persist between reboots. Swift attempts to create a directory in the directory specified by recon_lock_path however it does not recursively create any missing parent directories. This commit changes the value of [filter:recon]/recon_lock_path to that set by Swift, '/var/lock'. This allows it to create the directory '/var/lock/swift-recon-object-cron'. The creation of '/var/lock/swift' is also removed from the playbooks. Change-Id: I714367b02c7cf961e9e0bdee4e41f9e4e105b088 Closes-bug: #1496117
54 lines
1.4 KiB
Django/Jinja
54 lines
1.4 KiB
Django/Jinja
# {{ ansible_managed }}
|
|
|
|
{% set _api_threads = ansible_processor_vcpus|default(2) // 2 %}
|
|
{% set api_threads = _api_threads if _api_threads > 0 else 1 %}
|
|
|
|
{% if is_metal == true or is_metal == "True" and swift.storage_network is defined %}
|
|
{% set storage_bridge = 'ansible_' + swift.storage_network|replace('-', '_') %}
|
|
{% set swift_storage_address = hostvars[inventory_hostname][storage_bridge]['ipv4']['address'] %}
|
|
{% endif %}
|
|
|
|
[DEFAULT]
|
|
bind_ip = {{ swift_storage_address | default(ansible_ssh_host) }}
|
|
bind_port = {{ swift_container_port }}
|
|
workers = {{ swift_container_server_workers | default(api_threads) }}
|
|
|
|
user = {{ swift_system_user_name }}
|
|
devices = {{ swift_vars.mount_point | default(swift.mount_point) }}
|
|
log_facility = LOG_LOCAL3
|
|
|
|
[pipeline:main]
|
|
pipeline = healthcheck recon container-server
|
|
|
|
[app:container-server]
|
|
use = egg:swift#container
|
|
log_facility = LOG_LOCAL3
|
|
allow_versions = {{ swift_allow_versions }}
|
|
|
|
[filter:healthcheck]
|
|
use = egg:swift#healthcheck
|
|
|
|
[filter:recon]
|
|
use = egg:swift#recon
|
|
log_facility = LOG_LOCAL3
|
|
recon_cache_path = /var/cache/swift
|
|
recon_lock_path = /var/lock
|
|
|
|
{% if swift.replication_network is not defined or swift.replication_network == swift.storage_network %}
|
|
[container-replicator]
|
|
log_facility = LOG_LOCAL3
|
|
{% endif %}
|
|
|
|
[container-updater]
|
|
log_facility = LOG_LOCAL3
|
|
node_timeout = 15
|
|
conn_timeout = 5
|
|
|
|
[container-auditor]
|
|
log_facility = LOG_LOCAL3
|
|
|
|
[container-sync]
|
|
|
|
[filter:xprofile]
|
|
use = egg:swift#xprofile
|