No OneTemporary
Actions

Size

1 KB

Subscribers

None

View Options

	diff --git a/site-modules/profile/manifests/ceph/mon.pp b/site-modules/profile/manifests/ceph/mon.pp
	index bd49dfcc..765b9cc4 100644
	--- a/site-modules/profile/manifests/ceph/mon.pp
	+++ b/site-modules/profile/manifests/ceph/mon.pp
	@@ -1,48 +1,46 @@
	# Ceph Monitor profile
	class profile::ceph::mon {
	include profile::ceph::base

	$mon_secret = lookup('ceph::secrets::mon')
	$mgr_secret = lookup('ceph::secrets::mgr')

	$client_keys = lookup('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,
	}
	}

	$enabled_modules = pick(
	$::ceph_mgr_modules,
	{'enabled_modules' => []},
	)['enabled_modules']

	unless (member($enabled_modules, 'prometheus')) {
	Service<\| tag == 'ceph-mgr' \|>
	-> exec {'ceph mgr enable module prometheus':
	path => ['/bin', '/usr/bin'],
	}
	}

	- $fqdn = $::swh_hostname['internal_fqdn']
	-
	profile::prometheus::export_scrape_config {'ceph':
	- target => "http://${fqdn}:9283",
	+ target => "${profile::prometheus::node::actual_listen_address}:9283",
	}
	}