From 867b36625e38972e7a74989134a1f89dcbdc0fe7 Mon Sep 17 00:00:00 2001 From: Dan Prince Date: Mon, 18 Jan 2016 08:55:39 -0500 Subject: puppet: allow config of ad-hoc Ceph settings Including ::ceph::conf on ceph roles will allow ad-hoc (non-puppet managed) settings to be made in the ceph.conf using Hiera. Change-Id: I656a0ecde465023d7afad9371aa3c5c270078a67 --- puppet/manifests/overcloud_compute.pp | 1 + 1 file changed, 1 insertion(+) (limited to 'puppet/manifests/overcloud_compute.pp') diff --git a/puppet/manifests/overcloud_compute.pp b/puppet/manifests/overcloud_compute.pp index bb3575cf..06efd6d1 100644 --- a/puppet/manifests/overcloud_compute.pp +++ b/puppet/manifests/overcloud_compute.pp @@ -49,6 +49,7 @@ nova_config { $rbd_ephemeral_storage = hiera('nova::compute::rbd::ephemeral_storage', false) $rbd_persistent_storage = hiera('rbd_persistent_storage', false) if $rbd_ephemeral_storage or $rbd_persistent_storage { + include ::ceph::conf include ::ceph::profile::client $client_keys = hiera('ceph::profile::params::client_keys') -- cgit 1.2.3-korg