aboutsummaryrefslogtreecommitdiffstats
path: root/puppet/hieradata/controller.yaml
diff options
context:
space:
mode:
authorGiulio Fidente <gfidente@redhat.com>2016-02-18 14:34:37 +0100
committerGiulio Fidente <gfidente@redhat.com>2016-02-19 09:14:47 +0000
commit3ac244adda7618a0003f0c58ccbba7e3a1ba5f12 (patch)
treeed4487385ac09ecd4727fb70381c6312753e8e7c /puppet/hieradata/controller.yaml
parentfebe32556f87d0a9ca864bdee9db98473d5f2d74 (diff)
Use the class param to configure Cinder 'host' setting
By configuring the Cinder 'host' setting via the appropriate class param instead of cinder_config we don't risk to override it if the user is to pass additional config settings using cinder_config in ExtraConfig. Change-Id: Idf33d87e08355b5b4369ccb0001db8d4c3b4c20f
Diffstat (limited to 'puppet/hieradata/controller.yaml')
-rw-r--r--puppet/hieradata/controller.yaml4
1 files changed, 1 insertions, 3 deletions
diff --git a/puppet/hieradata/controller.yaml b/puppet/hieradata/controller.yaml
index a4dda4b4..e0e0ffbc 100644
--- a/puppet/hieradata/controller.yaml
+++ b/puppet/hieradata/controller.yaml
@@ -98,9 +98,7 @@ ceilometer::agent::auth::auth_endpoint_type: 'internalURL'
# cinder
cinder::scheduler::scheduler_driver: cinder.scheduler.filter_scheduler.FilterScheduler
cinder::cron::db_purge::destination: '/dev/null'
-cinder::config::cinder_config:
- DEFAULT/host:
- value: hostgroup
+cinder::host: hostgroup
# heat
heat::engine::configure_delegated_roles: false