openstack
/
tripleo-heat-templates
Code Issues Proposed changes

overcloud_volume: cleanup unused Puppet code 

overcloud_volume contains some code that is already deployed by
OS::TripleO::Services::CinderVolume service.

Change-Id: I3446883cb89dcf179a854e2adef81b899117f66a
This commit is contained in:
Emilien Macchi 2016-07-04 12:52:37 -04:00
parent 1006cbbdea
commit 1222eb7e7b
1 changed files with 0 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
puppet/manifests/overcloud_volume.pp
View File

@ -25,28 +25,6 @@ if hiera('step') >= 1 {
}
if hiera('step') >= 4 {
include ::cinder
include ::cinder::config
include ::cinder::glance
include ::cinder::volume
include ::cinder::setup_test_volume
$cinder_enable_iscsi = hiera('cinder_enable_iscsi_backend', true)
if $cinder_enable_iscsi {
$cinder_iscsi_backend = 'tripleo_iscsi'
cinder::backend::iscsi { $cinder_iscsi_backend :
iscsi_ip_address => hiera('cinder_iscsi_ip_address'),
iscsi_helper => hiera('cinder_iscsi_helper'),
}
}
$cinder_enabled_backends = any2array($cinder_iscsi_backend)
class { '::cinder::backends' :
enabled_backends => union($cinder_enabled_backends, hiera('cinder_user_enabled_backends')),
}
hiera_include('volume_classes')
}