openstack/devstack
Code Issues Proposed changes

Merge "Fix Swift rsync/replication configuration"

Browse Source
This commit is contained in:
Zuul 2025-03-28 07:01:02 +00:00 committed by Gerrit Code Review
commit c31cbc7620
2 changed files with 14 additions and 14 deletions
files/swift
rsyncd.conf
lib
swift

24
files/swift/rsyncd.conf

@ -6,74 +6,74 @@ address = 127.0.0.1
[account6612]
max connections = 25
path = %SWIFT_DATA_DIR%/1/node/
path = %SWIFT_DATA_DIR%/1/
read only = false
lock file = %SWIFT_DATA_DIR%/run/account6612.lock
[account6622]
max connections = 25
path = %SWIFT_DATA_DIR%/2/node/
path = %SWIFT_DATA_DIR%/2/
read only = false
lock file = %SWIFT_DATA_DIR%/run/account6622.lock
[account6632]
max connections = 25
path = %SWIFT_DATA_DIR%/3/node/
path = %SWIFT_DATA_DIR%/3/
read only = false
lock file = %SWIFT_DATA_DIR%/run/account6632.lock
[account6642]
max connections = 25
path = %SWIFT_DATA_DIR%/4/node/
path = %SWIFT_DATA_DIR%/4/
read only = false
lock file = %SWIFT_DATA_DIR%/run/account6642.lock
[container6611]
max connections = 25
path = %SWIFT_DATA_DIR%/1/node/
path = %SWIFT_DATA_DIR%/1/
read only = false
lock file = %SWIFT_DATA_DIR%/run/container6611.lock
[container6621]
max connections = 25
path = %SWIFT_DATA_DIR%/2/node/
path = %SWIFT_DATA_DIR%/2/
read only = false
lock file = %SWIFT_DATA_DIR%/run/container6621.lock
[container6631]
max connections = 25
path = %SWIFT_DATA_DIR%/3/node/
path = %SWIFT_DATA_DIR%/3/
read only = false
lock file = %SWIFT_DATA_DIR%/run/container6631.lock
[container6641]
max connections = 25
path = %SWIFT_DATA_DIR%/4/node/
path = %SWIFT_DATA_DIR%/4/
read only = false
lock file = %SWIFT_DATA_DIR%/run/container6641.lock
[object6613]
max connections = 25
path = %SWIFT_DATA_DIR%/1/node/
path = %SWIFT_DATA_DIR%/1/
read only = false
lock file = %SWIFT_DATA_DIR%/run/object6613.lock
[object6623]
max connections = 25
path = %SWIFT_DATA_DIR%/2/node/
path = %SWIFT_DATA_DIR%/2/
read only = false
lock file = %SWIFT_DATA_DIR%/run/object6623.lock
[object6633]
max connections = 25
path = %SWIFT_DATA_DIR%/3/node/
path = %SWIFT_DATA_DIR%/3/
read only = false
lock file = %SWIFT_DATA_DIR%/run/object6633.lock
[object6643]
max connections = 25
path = %SWIFT_DATA_DIR%/4/node/
path = %SWIFT_DATA_DIR%/4/
read only = false
lock file = %SWIFT_DATA_DIR%/run/object6643.lock

4
lib/swift

@ -318,8 +318,8 @@ function generate_swift_config_services {
iniuncomment ${swift_node_config} DEFAULT mount_check
iniset ${swift_node_config} DEFAULT mount_check false
iniuncomment ${swift_node_config} ${server_type}-replicator vm_test_mode
iniset ${swift_node_config} ${server_type}-replicator vm_test_mode yes
iniuncomment ${swift_node_config} ${server_type}-replicator rsync_module
iniset ${swift_node_config} ${server_type}-replicator rsync_module "{replication_ip}::${server_type}{replication_port}"
# Using a sed and not iniset/iniuncomment because we want to a global
# modification and make sure it works for new sections.