summaryrefslogtreecommitdiffstats
path: root/puppet/hieradata/controller.yaml
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-02-10 22:48:48 +0000
committerGerrit Code Review <review@openstack.org>2016-02-10 22:48:48 +0000
commit66493bc76ccb5d859cbf23fd348a83c1ff0042d7 (patch)
tree5f503ab029d988ea846050be9dc480a2ff245579 /puppet/hieradata/controller.yaml
parente8ec06c4167fc9c84770bbf404723ed6db17ce8a (diff)
parentfd0b25b010db428c450b99b50ff3a0d60d263005 (diff)
Merge "Set 'host' globally in Cinder instead of per-backend basis"
Diffstat (limited to 'puppet/hieradata/controller.yaml')
-rw-r--r--puppet/hieradata/controller.yaml3
1 files changed, 3 insertions, 0 deletions
diff --git a/puppet/hieradata/controller.yaml b/puppet/hieradata/controller.yaml
index 06be40e4..d2ca9bea 100644
--- a/puppet/hieradata/controller.yaml
+++ b/puppet/hieradata/controller.yaml
@@ -95,6 +95,9 @@ 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
# heat
heat::engine::configure_delegated_roles: false