openstack/openstack-ansible-os_swift
Code Issues Proposed changes

Refactor definition of lock path

Browse Source 
Depends-On: https://review.opendev.org/c/openstack/openstack-ansible/+/819300
Depends-On: https://review.opendev.org/c/openstack/ansible-role-systemd_service/+/819298
Change-Id: I6ce09e0e0b83e14fc9386fc4cb49921a21fcabd4
This commit is contained in:
Dmitriy Rabotyagov
2021-11-30 12:42:47 +02:00
parent b96ce88221
commit 451678a6fd
7 changed files with 16 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
defaults/main.yml
View File

@@ -57,7 +57,9 @@ swift_system_group_name: swift
swift_system_shell: /bin/bash swift_system_shell: /bin/bash
swift_system_comment: swift system user swift_system_comment: swift system user
swift_system_home_folder: "/var/lib/{{ swift_system_user_name }}" swift_system_home_folder: "/var/lib/{{ swift_system_user_name }}"
swift_system_slice_name: swift
swift_lock_dir: "{{ openstack_lock_dir | default('/run/lock') }}"
swift_cache_path: /var/cache/swift
## Auth token ## Auth token
swift_delay_auth_decision: true swift_delay_auth_decision: true

4
tasks/main.yml
View File

@@ -107,8 +107,8 @@
systemd_user_name: "{{ swift_system_user_name }}" systemd_user_name: "{{ swift_system_user_name }}"
systemd_group_name: "{{ swift_system_group_name }}" systemd_group_name: "{{ swift_system_group_name }}"
systemd_tempd_prefix: openstack systemd_tempd_prefix: openstack
systemd_slice_name: swift systemd_slice_name: "{{ swift_system_slice_name }}"
systemd_lock_path: /var/lock/swift systemd_lock_dir: "{{ swift_lock_dir }}"
systemd_CPUAccounting: true systemd_CPUAccounting: true
systemd_BlockIOAccounting: true systemd_BlockIOAccounting: true
systemd_MemoryAccounting: true systemd_MemoryAccounting: true

2
tasks/swift_pre_install.yml
View File

@@ -57,7 +57,7 @@
- { path: "/etc/swift/proxy-server" } - { path: "/etc/swift/proxy-server" }
- { path: "/etc/swift/scripts" } - { path: "/etc/swift/scripts" }
- { path: "/etc/swift/ring_build_files" } - { path: "/etc/swift/ring_build_files" }
- { path: "/var/cache/swift" } - { path: "{{ swift_cache_path }}" }
- { path: "{{ swift_system_home_folder }}" } - { path: "{{ swift_system_home_folder }}" }
- { path: "/etc/rsync.d", owner: "root", group: "root" } - { path: "/etc/rsync.d", owner: "root", group: "root" }

4
templates/account-server.conf.j2
View File

@@ -36,8 +36,8 @@ use = egg:swift#healthcheck
[filter:recon] [filter:recon]
use = egg:swift#recon use = egg:swift#recon
recon_cache_path = /var/cache/swift recon_cache_path = {{ swift_cache_path }}
recon_lock_path = /var/lock recon_lock_path = {{ swift_lock_dir }}
{% if not swift_dedicated_replication %} {% if not swift_dedicated_replication %}
[account-replicator] [account-replicator]

4
templates/container-server.conf.j2
View File

@@ -37,8 +37,8 @@ use = egg:swift#healthcheck
[filter:recon] [filter:recon]
use = egg:swift#recon use = egg:swift#recon
recon_cache_path = /var/cache/swift recon_cache_path = {{ swift_cache_path }}
recon_lock_path = /var/lock recon_lock_path = {{ swift_lock_dir }}
{% if not swift_dedicated_replication %} {% if not swift_dedicated_replication %}
[container-replicator] [container-replicator]

4
templates/object-server.conf.j2
View File

@@ -38,8 +38,8 @@ use = egg:swift#healthcheck
[filter:recon] [filter:recon]
use = egg:swift#recon use = egg:swift#recon
recon_cache_path = /var/cache/swift recon_cache_path = {{ swift_cache_path }}
recon_lock_path = /var/lock recon_lock_path = {{ swift_lock_dir }}
{% if not swift_dedicated_replication %} {% if not swift_dedicated_replication %}
[object-replicator] [object-replicator]

8
templates/rsyncd.conf.j2
View File

@@ -10,13 +10,13 @@ address = {{ swift_replication_address }}
max connections = {{ swift_account_max_rsync_connections }} max connections = {{ swift_account_max_rsync_connections }}
path = {{ swift_vars.mount_point | default(swift.mount_point) }} path = {{ swift_vars.mount_point | default(swift.mount_point) }}
read only = false read only = false
lock file = /var/lock/account.lock lock file = {{ swift_lock_dir }}/account.lock
[container] [container]
max connections = {{ swift_container_max_rsync_connections }} max connections = {{ swift_container_max_rsync_connections }}
path = {{ swift_vars.mount_point | default(swift.mount_point) }} path = {{ swift_vars.mount_point | default(swift.mount_point) }}
read only = false read only = false
lock file = /var/lock/container.lock lock file = {{ swift_lock_dir }}/container.lock
{% if swift_rsync_module_per_drive %} {% if swift_rsync_module_per_drive %}
{### Set up per drive rsync modules #} {### Set up per drive rsync modules #}
@@ -45,7 +45,7 @@ lock file = /var/lock/container.lock
max connections = {{ swift_object_max_rsync_connections }} max connections = {{ swift_object_max_rsync_connections }}
path = {{ swift_vars.mount_point | default(swift.mount_point) }} path = {{ swift_vars.mount_point | default(swift.mount_point) }}
read only = false read only = false
lock file = /var/lock/object_{{ drive.name }}.lock lock file = {{ swift_lock_dir }}/object_{{ drive.name }}.lock
{% endif %} {% endif %}
{% set devAdded = True %} {% set devAdded = True %}
@@ -57,7 +57,7 @@ lock file = /var/lock/object_{{ drive.name }}.lock
max connections = {{ swift_object_max_rsync_connections }} max connections = {{ swift_object_max_rsync_connections }}
path = {{ swift_vars.mount_point | default(swift.mount_point) }} path = {{ swift_vars.mount_point | default(swift.mount_point) }}
read only = false read only = false
lock file = /var/lock/object.lock lock file = {{ swift_lock_dir }}/object.lock
{% endif %} {% endif %}
&include /etc/rsync.d &include /etc/rsync.d