diff --git a/puppet/hieradata/controller.yaml b/puppet/hieradata/controller.yaml
index a4dda4b4d0..e0e0ffbcda 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