Browse Source

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

stable/mimic
Zuul 1 month ago
parent
commit
a18da81361
1 changed files with 11 additions and 1 deletions
  1. 11
    1
      manifests/osd.pp

+ 11
- 1
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
163 163
         }
164 164
       }
165 165
 
166
-      Exec[$ceph_check_udev] -> Exec[$ceph_prepare]
166
+      #name of the bootstrap osd keyring
167
+      $bootstrap_osd_keyring = "/var/lib/ceph/bootstrap-osd/${cluster_name}.keyring"
168
+      exec { "extract-bootstrap-osd-keyring-${name}":
169
+        command => "/bin/true # comment to satisfy puppet syntax requirements
170
+ceph auth get client.bootstrap-osd > ${bootstrap_osd_keyring}
171
+",
172
+        creates => "${bootstrap_osd_keyring}",
173
+      }
174
+      Exec[$ceph_check_udev] -> Exec["extract-bootstrap-osd-keyring-${name}"]
175
+      Exec["extract-bootstrap-osd-keyring-${name}"] -> Exec[$ceph_prepare]
176
+
167 177
       # ceph-disk: prepare should be idempotent http://tracker.ceph.com/issues/7475
168 178
       exec { $ceph_prepare:
169 179
         command   => "/bin/true # comment to satisfy puppet syntax requirements

Loading…
Cancel
Save