swift: Fix missing log directory in Ubuntu

Code Issues Proposed changes

... and capture rsyslog config files to ensure that rsyslog is properly
configured.
Backport note:
This backport includes fb7629634d to
ensure the /etc/rsyslog.d directory is captured.
Change-Id: I0b9884b092706f633513b2bd49d368efe924585a
(cherry picked from commit b3251241be)

This commit is contained in:

Takashi Kajinami

2024年06月03日 23:54:20 +09:00

parent 9e98a441b3

commit 9240306586

2 changed files with 9 additions and 1 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

8
copy_logs.sh

View File

@@ -101,6 +101,14 @@ if which journalctl &> /dev/null; then

sudo journalctl --no-pager > $LOG_DIR/syslog.txt

fi

# rsyslog

if [ -d /etc/rsyslog.d ]; then

sudo cp -r /etc/rsyslog.d $LOG_DIR/etc/

fi

if [ -f /etc/rsyslog.conf ]; then

sudo cp /etc/rsyslog.conf $LOG_DIR/etc/

fi

# network interfaces

if [ -d /etc/sysconfig/network-scripts ]; then

sudo cp -r /etc/sysconfig/network-scripts $LOG_DIR/etc/sysconfig/

2
manifests/swift.pp

View File

@@ -14,7 +14,7 @@ class openstack_integration::swift {

before => Anchor['swift::service::begin'],

}

if($facts['os']['name']=='Debian'){

if($facts['os']['family']=='Debian'){

# Ubuntu/Debian requires particular permissions for rsyslog to work

$log_dir_owner = $facts['os']['name'] ? {

'Debian' => 'swift',