From: Giulio Fidente <gfidente@redhat.com>
Date: Thu, 18 Feb 2016 13:34:37 +0000 (+0100)
Subject: Use the class param to configure Cinder 'host' setting
X-Git-Tag: opnfv-6.0.0~2173^2
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=3ac244adda7618a0003f0c58ccbba7e3a1ba5f12;p=apex-tripleo-heat-templates.git

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
---

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