diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2015-09-09 11:59:04 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2015-09-09 11:59:04 +0000 |
| commit | 486213b6a797994798f502e9a75d2e3b45b77b56 (patch) | |
| tree | 645f7e9868228d948a3e39e6c007411cd489e13f /puppet | |
| parent | 9a8e384a145b48ef9d7f58da13bc828bbc79941d (diff) | |
| parent | d1388e0c347b856e6f32bec295558804af32e3c3 (diff) | |
Merge "Don't add 'host' parameter to cinder.conf"
Diffstat (limited to 'puppet')
| -rw-r--r-- | puppet/manifests/overcloud_controller.pp | 4 | ||||
| -rw-r--r-- | puppet/manifests/overcloud_controller_pacemaker.pp | 4 |
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', |