starlingx
/
stx-puppet
Code Issues Proposed changes

Merge "Support for ceph.conf cleanup during upgrade activation"

This commit is contained in:
Zuul 2021-11-15 01:55:06 +00:00 committed by Gerrit Code Review
parent 6b91bc5160 e223b96ac4
commit 40893d5787
1 changed files with 42 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -919,4 +919,46 @@ class platform::ceph::rgw::keystone::runtime
}
}
# Used during upgrades activation of stx.6.0 to remove msgr v1 config for
# mon_host
class platform::ceph::upgrade::runtime
inherits ::platform::ceph::params {
$system_mode = $::platform::params::system_mode
$system_type = $::platform::params::system_type
if $service_enabled {
if $system_type == 'All-in-one' {
if $system_mode == 'simplex' {
# 1 node configuration, a single monitor is available
$mon_host = $mon_0_addr
# Cleanup stx.5.0 ceph.conf from restored file from upgrade backup
ceph_config {
'mon/mon warn on insecure global id reclaim': value => false;
'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']
} else {
# 2 node configuration, we have a floating monitor
$mon_host = $floating_mon_addr
}
} else {
# Multinode & standard, any 2 monitors form a cluster
if $mon_2_host {
$mon_host = "${mon_0_addr},${mon_1_addr},${mon_2_addr}"
} else {
$mon_host = "${mon_0_addr},${mon_1_addr}"
}
}
ceph_config {
'global/mon_host': value => $mon_host;
} -> Exec['Restart Ceph Monitor']
exec { 'Restart Ceph Monitor' :
command => '/etc/init.d/ceph restart mon',
}
}
}