aboutsummaryrefslogtreecommitdiffstats
path: root/puppet
diff options
context:
space:
mode:
authorDerek Higgins <derekh@redhat.com>2015-09-07 16:17:02 +0100
committerDerek Higgins <derekh@redhat.com>2015-09-07 16:17:02 +0100
commitd1388e0c347b856e6f32bec295558804af32e3c3 (patch)
tree421eb24ab0b27ccb1eec16ce926b4334e7b02ad3 /puppet
parent63fde6c98b4b46ddb9168e2ee3d571390f6979ad (diff)
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
Diffstat (limited to 'puppet')
-rw-r--r--puppet/manifests/overcloud_controller.pp4
-rw-r--r--puppet/manifests/overcloud_controller_pacemaker.pp4
2 files changed, 0 insertions, 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',