openstack
/
puppet-ceph
Code Issues Proposed changes

Merge "Resolve puppet overwriting a pre-existing bootstrap-osd auth entry" into stable/mimic

This commit is contained in:
Zuul 2019-08-02 16:57:31 +00:00 committed by Gerrit Code Review
parent 7c99266d82 b90c642c68
commit a18da81361
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
manifests/osd.pp
View File

@ -163,7 +163,17 @@ test -z $(ceph-disk list $(readlink -f ${data}) | egrep -o '[0-9a-f]{8}-([0-9a-f
}
}
Exec[$ceph_check_udev] -> Exec[$ceph_prepare]
#name of the bootstrap osd keyring
$bootstrap_osd_keyring = "/var/lib/ceph/bootstrap-osd/${cluster_name}.keyring"
exec { "extract-bootstrap-osd-keyring-${name}":
command => "/bin/true # comment to satisfy puppet syntax requirements
ceph auth get client.bootstrap-osd > ${bootstrap_osd_keyring}
",
creates => "${bootstrap_osd_keyring}",
}
Exec[$ceph_check_udev] -> Exec["extract-bootstrap-osd-keyring-${name}"]
Exec["extract-bootstrap-osd-keyring-${name}"] -> Exec[$ceph_prepare]
# ceph-disk: prepare should be idempotent http://tracker.ceph.com/issues/7475
exec { $ceph_prepare:
command => "/bin/true # comment to satisfy puppet syntax requirements