From d1388e0c347b856e6f32bec295558804af32e3c3 Mon Sep 17 00:00:00 2001
From: Derek Higgins <derekh@redhat.com>
Date: Mon, 7 Sep 2015 16:17:02 +0100
Subject: Don't add 'host' parameter to cinder.conf

As of I54a75652efd5e91464b84adf84004400b343c3a5 for rdb
this is being done by the cinder puppet module.

Change-Id: I109e139fcbb859a0d9ed99054656be94975d33b5
---
 puppet/manifests/overcloud_controller.pp           | 4 ----
 puppet/manifests/overcloud_controller_pacemaker.pp | 4 ----
 2 files changed, 8 deletions(-)

diff --git a/puppet/manifests/overcloud_controller.pp b/puppet/manifests/overcloud_controller.pp
index 4a1b0e60..c2b12a6e 100644
--- a/puppet/manifests/overcloud_controller.pp
+++ b/puppet/manifests/overcloud_controller.pp
@@ -288,10 +288,6 @@ if hiera('step') >= 3 {
   if hiera('cinder_enable_rbd_backend', false) {
     $cinder_rbd_backend = 'tripleo_ceph'
 
-    cinder_config {
-      "${cinder_rbd_backend}/host": value => 'hostgroup';
-    }
-
     cinder::backend::rbd { $cinder_rbd_backend :
       rbd_pool        => 'volumes',
       rbd_user        => 'openstack',
diff --git a/puppet/manifests/overcloud_controller_pacemaker.pp b/puppet/manifests/overcloud_controller_pacemaker.pp
index 9f6a38fb..013ea360 100644
--- a/puppet/manifests/overcloud_controller_pacemaker.pp
+++ b/puppet/manifests/overcloud_controller_pacemaker.pp
@@ -655,10 +655,6 @@ if hiera('step') >= 3 {
   if hiera('cinder_enable_rbd_backend', false) {
     $cinder_rbd_backend = 'tripleo_ceph'
 
-    cinder_config {
-      "${cinder_rbd_backend}/host": value => 'hostgroup';
-    }
-
     cinder::backend::rbd { $cinder_rbd_backend :
       rbd_pool        => 'volumes',
       rbd_user        => 'openstack',
-- 
cgit 1.2.3-korg