Browse Source

Fix clear passwords presented in collected log files

The --relative option used by rsync resulted in changes
to the paths of some collected files in the tarball,
which in turn resulted in failures to mask the passwords
in those files (as they were no longer in the expected
location).

This update removes the --relative option, restoring
the location to that expected by the masking.

Closes-Bug: 1906524

Signed-off-by: Enzo Candotti <enzo.candotti@windriver.com>
Change-Id: I001d3e2b1d2ec0ff88a129fe7b31bee21928686b
changes/74/772374/4
Enzo Candotti 4 months ago
parent
commit
a4365bf1b2
2 changed files with 4 additions and 4 deletions
  1. +2
    -2
      tools/collector/scripts/collect_dc.sh
  2. +2
    -2
      tools/collector/scripts/collect_sysinv.sh

+ 2
- 2
tools/collector/scripts/collect_dc.sh View File

@ -1,6 +1,6 @@
#! /bin/bash
#
# Copyright (c) 2020 Wind River Systems, Inc.
# Copyright (c) 2020-2021 Wind River Systems, Inc.
#
# SPDX-License-Identifier: Apache-2.0
#
@ -85,7 +85,7 @@ if [ "$nodetype" = "controller" ] ; then
dcmanager subcloud-group list 2>>${COLLECT_ERROR_LOG} >> ${LOGFILE}
# copy the /opt/dc/ansible dir but exclude any iso files
rsync -a --relative --exclude '*.iso' /opt/dc/ansible ${extradir}
rsync -a --exclude '*.iso' /opt/dc/ansible ${extradir}
delimiter ${LOGFILE} "find /opt/dc-vault -ls"
find /opt/dc-vault -ls 2>>${COLLECT_ERROR_LOG} >> ${LOGFILE}


+ 2
- 2
tools/collector/scripts/collect_sysinv.sh View File

@ -1,6 +1,6 @@
#! /bin/bash
#
# Copyright (c) 2013-2020 Wind River Systems, Inc.
# Copyright (c) 2013-2021 Wind River Systems, Inc.
#
# SPDX-License-Identifier: Apache-2.0
#
@ -108,7 +108,7 @@ if [ "$nodetype" = "controller" ] ; then
# copy /opt/platform to extra dir while filtering out the
# iso and lost+found dirs
rsync -a --relative --exclude 'iso' --exclude 'lost+found' /opt/platform ${extradir}
rsync -a --exclude 'iso' --exclude 'lost+found' /opt/platform ${extradir}
fi


Loading…
Cancel
Save