summaryrefslogtreecommitdiffstats
path: root/puppet/hieradata/controller.yaml
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-02-19 11:29:45 +0000
committerGerrit Code Review <review@openstack.org>2016-02-19 11:29:45 +0000
commit838c998d3d6b3f3703f1ba3fea7a47c862e09212 (patch)
tree09bc2e60cde86cb37c739c28387c299ad31bef3a /puppet/hieradata/controller.yaml
parentdeec3c56abe3795d21c911ce2d25e5d98218a5a2 (diff)
parent3ac244adda7618a0003f0c58ccbba7e3a1ba5f12 (diff)
Merge "Use the class param to configure Cinder 'host' setting"
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