openstack/devstack
Code Issues Proposed changes

Merge "swift: Fix the empty gid option in rsyncd.conf"

Browse Source
This commit is contained in:
Zuul 2021-08-24 20:38:27 +00:00 committed by Gerrit Code Review
commit ab2a529714
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/swift
View File

@ -335,7 +335,6 @@ function configure_swift {
local node_number local node_number
local swift_node_config local swift_node_config
local swift_log_dir local swift_log_dir
local user_group
# Make sure to kill all swift processes first # Make sure to kill all swift processes first
$SWIFT_BIN_DIR/swift-init --run-dir=${SWIFT_DATA_DIR}/run all stop || true $SWIFT_BIN_DIR/swift-init --run-dir=${SWIFT_DATA_DIR}/run all stop || true
@ -353,7 +352,7 @@ function configure_swift {
# partitions (which make more sense when you have a multi-node # partitions (which make more sense when you have a multi-node
# setup) we configure it with our version of rsync. # setup) we configure it with our version of rsync.
sed -e " sed -e "
s/%GROUP%/${USER_GROUP}/; s/%GROUP%/$(id -g -n ${STACK_USER})/;
s/%USER%/${STACK_USER}/; s/%USER%/${STACK_USER}/;
s,%SWIFT_DATA_DIR%,$SWIFT_DATA_DIR,; s,%SWIFT_DATA_DIR%,$SWIFT_DATA_DIR,;
" $FILES/swift/rsyncd.conf | sudo tee /etc/rsyncd.conf " $FILES/swift/rsyncd.conf | sudo tee /etc/rsyncd.conf