diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2016-09-29 23:58:01 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2016-09-29 23:58:01 +0000 |
| commit | 01198c81d29af2a90670e782adff865715241b38 (patch) | |
| tree | 41c6717c70cf9029bd69d8b5e7cd7128030e0659 /extraconfig/tasks/major_upgrade_ceph_storage.sh | |
| parent | f5f41504e5de521154f5eadc376f27c24c915d64 (diff) | |
| parent | 059307718f4422e0840a90ad40f98947260ac8f1 (diff) | |
Merge "Use -L with chown and set crush map tunables when upgrading Ceph"
Diffstat (limited to 'extraconfig/tasks/major_upgrade_ceph_storage.sh')
| -rw-r--r-- | extraconfig/tasks/major_upgrade_ceph_storage.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/extraconfig/tasks/major_upgrade_ceph_storage.sh b/extraconfig/tasks/major_upgrade_ceph_storage.sh index dc80a724..705e84eb 100644 --- a/extraconfig/tasks/major_upgrade_ceph_storage.sh +++ b/extraconfig/tasks/major_upgrade_ceph_storage.sh @@ -18,7 +18,7 @@ set -eu echo INFO: starting $(basename "$0") # Exit if not running -if ! pidof ceph-osd; then +if ! pidof ceph-osd &> /dev/null; then echo INFO: ceph-osd is not running, skipping exit 0 fi @@ -63,7 +63,7 @@ if [[ "$UPDATED_VERSION" =~ ^0\.94.* ]]; then elif [[ "$UPDATED_VERSION" =~ ^10\.2.* ]]; then # RPM could own some of these but we can't take risks on the pre-existing files for d in /var/lib/ceph/osd /var/log/ceph /var/run/ceph /etc/ceph; do - chown -R ceph:ceph $d || echo WARNING: chown of $d failed + chown -L -R ceph:ceph $d || echo WARNING: chown of $d failed done # Replay udev events with newer rules |