starlingx
/
stx-puppet
Code Issues Proposed changes

Merge "Update SM puppet to fix rook-ceph's storage-backend-add"

This commit is contained in:
Zuul 2024-03-19 22:06:58 +00:00 committed by Gerrit Code Review
parent d298294244 59e9fe879b
commit 46ed4c33ae
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
puppet-manifests/src/bin/apply_network_config.sh
View File

@ -370,10 +370,10 @@ else
parse_interface_stanzas
[ -f /var/run/.network_upgrade_bootstrap ]
upgr_bootstrap=$?
upgr_bootstrap=1
if [ ${upgr_bootstrap} -eq 0 ]; then
if [ -f /var/run/.network_upgrade_bootstrap ]; then
upgr_bootstrap=0
log_it info "Upgrade bootstrap is in execution"
fi

5
puppet-manifests/src/modules/platform/manifests/sm.pp
View File

@ -1399,10 +1399,11 @@ class platform::sm::ceph::runtime {
if $rook_configured {
if $system_type == 'All-in-one' and 'duplex' in $system_mode {
exec { 'Provision Cephmon FS in SM (service-group-member cephmon-fs)':
Class[platform::drbd::rookmon] -> Class[$name]
exec { 'Provision Rookmon FS in SM (service-group-member rookmon-fs)':
command => 'sm-provision service-group-member controller-services rookmon-fs --apply',
}
-> exec { 'Provision Cephmon DRBD in SM (service-group-member drbd-cephmon':
-> exec { 'Provision Rookmon DRBD in SM (service-group-member drbd-rookmon)':
command => 'sm-provision service-group-member controller-services drbd-rookmon --apply',
}
-> exec { 'Provision Rook-mon-exit in SM (service-group-member rook-mon-exit)':