Fix Swift rsync/replication configuration
Swift rsync and replication services are up and running, however they
fail to replicate any data if needed and if used with more than one
replica.
This patch removes a deprecated option setting[1] and replaces it with
the required setting to use the correct rsync module suffix.
Additionally it removes an outdated subdirectory suffix in the rsyncd
configuration that has been removed as well[2].
Closes-Bug: #2100272
[1] https://opendev.org/openstack/swift/commit/675145ef4a131d548cc1122689732b9b65e5def4
[2] https://opendev.org/openstack/devstack/commit/0e58d22897457831b9dbf02d66a2f29d43803597
Change-Id: I5283405d00883a4dd11b7c001b1bba3776e576b8
diff --git a/files/swift/rsyncd.conf b/files/swift/rsyncd.conf
index c49f716..937d6c4 100644
--- a/files/swift/rsyncd.conf
+++ b/files/swift/rsyncd.conf
@@ -6,74 +6,74 @@
[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