Browse Source

Merge "Configure rsyncd without pid file for Swift" into stable/train

changes/43/755343/2
Zuul 9 months ago
committed by Gerrit Code Review
parent
commit
f3dfeeb897
1 changed files with 1 additions and 14 deletions
  1. +1
    -14
      deployment/swift/swift-storage-container-puppet.yaml

+ 1
- 14
deployment/swift/swift-storage-container-puppet.yaml View File

@ -163,6 +163,7 @@ outputs:
"%{hiera('$NETWORK')}"
params:
$NETWORK: {get_param: [ServiceNetMap, SwiftStorageNetwork]}
rsync::server::pid_file: 'UNSET'
-
if:
- account_workers_zero
@ -310,16 +311,6 @@ outputs:
command: ['chown', '-R', 'swift:', '/srv/node']
volumes:
- /srv/node:/srv/node:z
# FIXME (cschwede): remove this once the pid file setting is disabled
swift_rsync_fix:
start_order: 1
image: {get_param: ContainerSwiftObjectImage}
net: host
user: root
detach: false
command: ['/bin/bash', '-c', 'sed -i "/pid file/d" /var/lib/kolla/config_files/src/etc/rsyncd.conf']
volumes:
- /var/lib/config-data/puppet-generated/swift:/var/lib/kolla/config_files/src:rw,z
step_4:
map_merge:
- if:
@ -673,10 +664,6 @@ outputs:
- rsyslog_config is changed
- rsyslog_config.rc == 0
update_tasks:
- name: Ensure rsyncd pid file is absent
file:
path: /var/run/rsyncd.pid
state: absent
- name: Check swift containers log folder/symlink exists
stat:
path: /var/log/containers/swift


Loading…
Cancel
Save