Commit e1f084 introduced a regression when the bootstrap OSD secret is
stored in encrypted databags (EDB). The problem is that if the first
monitor is started without the bootstrap OSD key in the keyring, a
random OSD secret is generated, which will then not match the
pre-generated one.
The solution is to revert the resource that adds the bootstrap OSD key
to where it was (before monitor starts) but add a condition that ensures
this is only done if EDBs are enabled. When EDBs are not enabled, it is
not necessary to add the bootstrap OSD key to the keyring.
Commit e1f084 introduced a regression when the bootstrap OSD secret is stored in encrypted databags (EDB). The problem is that if the first monitor is started without the bootstrap OSD key in the keyring, a random OSD secret is generated, which will then not match the pre-generated one.
The solution is to revert the resource that adds the bootstrap OSD key to where it was (before monitor starts) but add a condition that ensures this is only done if EDBs are enabled. When EDBs are not enabled, it is not necessary to add the bootstrap OSD key to the keyring.