From dced4001f2c1ba52a42f38bab43bc8e275f4e9fc Mon Sep 17 00:00:00 2001 From: Dan Prince Date: Mon, 18 Jan 2016 08:48:04 -0500 Subject: puppet: allow config of ad-hoc Cinder settings Including ::cinder::config on controller, and volume roles will allow ad-hoc (non-puppet managed) settings to be made in the cinder.conf using Hiera. Change-Id: I519aff02e3cfb7fbf57e89c7a139564df42f8967 --- puppet/manifests/overcloud_controller.pp | 1 + puppet/manifests/overcloud_controller_pacemaker.pp | 1 + 2 files changed, 2 insertions(+) diff --git a/puppet/manifests/overcloud_controller.pp b/puppet/manifests/overcloud_controller.pp index 503fbd74..5eb924ef 100644 --- a/puppet/manifests/overcloud_controller.pp +++ b/puppet/manifests/overcloud_controller.pp @@ -361,6 +361,7 @@ if hiera('step') >= 3 { } include ::cinder + include ::cinder::config include ::cinder::api include ::cinder::glance include ::cinder::scheduler diff --git a/puppet/manifests/overcloud_controller_pacemaker.pp b/puppet/manifests/overcloud_controller_pacemaker.pp index d358a93b..1f3962f2 100644 --- a/puppet/manifests/overcloud_controller_pacemaker.pp +++ b/puppet/manifests/overcloud_controller_pacemaker.pp @@ -728,6 +728,7 @@ if hiera('step') >= 3 { } include ::cinder + include ::cinder::config class { '::cinder::api': sync_db => $sync_db, manage_service => false, -- cgit 1.2.3-korg