starlingx
/
stx-puppet
Code Issues Proposed changes

Merge "Remove ceph mon restart during upgrade"

This commit is contained in:
Zuul 2021-11-26 22:44:06 +00:00 committed by Gerrit Code Review
parent bc938aa4c2 b382a852cb
commit 9e7df4aa83
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
puppet-manifests/src/modules/platform/manifests/ceph.pp
View File

@ -935,7 +935,11 @@ class platform::ceph::upgrade::runtime
'mon/mon warn on insecure global id reclaim allowed': value => false;
'mon/auth allow insecure global id reclaim': value => true;
'mon.controller-0/mon_addr': ensure => absent;
} -> Exec['Restart Ceph Monitor']
} -> exec { 'Removing ceph warnings':
command => 'ceph config set mon mon_warn_on_insecure_global_id_reclaim false;\
ceph config set mon mon_warn_on_insecure_global_id_reclaim_allowed false;\
ceph config set mon auth_allow_insecure_global_id_reclaim false'
}
} else {
# 2 node configuration, we have a floating monitor
$mon_host = $floating_mon_addr
@ -951,10 +955,6 @@ class platform::ceph::upgrade::runtime
ceph_config {
'global/mon_host': value => $mon_host;
} -> Exec['Restart Ceph Monitor']
exec { 'Restart Ceph Monitor' :
command => '/etc/init.d/ceph restart mon',
}
}
}