diff --git a/manifests/ceph/mon.pp b/manifests/ceph/mon.pp index 7ad40c2..7cf39be 100644 --- a/manifests/ceph/mon.pp +++ b/manifests/ceph/mon.pp @@ -1,30 +1,30 @@ # Ceph Monitor profile class profile::ceph::mon { include profile::ceph::base - $mon_secret = hiera('ceph::secret::mon') - $mgr_secret = hiera('ceph::secret::mgr') + $mon_secret = hiera('ceph::secrets::mon') + $mgr_secret = hiera('ceph::secrets::mgr') $client_keys = hiera('ceph::keys') ::ceph::mon {$::hostname: key => $mon_secret, } ::ceph::mgr {$::hostname: key => $mgr_secret, inject_key => true, } ::Ceph::Key { inject => true, inject_as_id => 'mon.', inject_keyring => "/var/lib/ceph/mon/ceph-${::hostname}/keyring", } each($client_keys) |$name, $data| { ::ceph::key {"client.${name}": * => $data, } } } diff --git a/manifests/ceph/osd.pp b/manifests/ceph/osd.pp index 4653463..81fa669 100644 --- a/manifests/ceph/osd.pp +++ b/manifests/ceph/osd.pp @@ -1,10 +1,10 @@ # Ceph OSD profile class profile::ceph::osd { include profile::ceph::base - $bootstrap_osd_secret = hiera('ceph::secret::bootstrap_osd') + $bootstrap_osd_secret = hiera('ceph::secrets::bootstrap_osd') ::ceph::key {'client.bootstrap-osd': keyring_path => '/var/lib/ceph/bootstrap-osd/ceph.keyring', secret => $bootstrap_osd_secret, } }