aboutsummaryrefslogtreecommitdiffstats
path: root/puppet/manifests
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-07-05 12:34:08 +0000
committerGerrit Code Review <review@openstack.org>2016-07-05 12:34:08 +0000
commit56398e72be4fe69add9b6e57a9b7d9ede6ece94c (patch)
tree00503f6d68a564cb32b9c7ed70d49f2438eb0e8d /puppet/manifests
parentbfb34ccdee38bc9ec95f054a43dd5541f91f8c9d (diff)
parent1222eb7e7b6533539cfbe0825dd50ef269202bee (diff)
Merge "overcloud_volume: cleanup unused Puppet code"
Diffstat (limited to 'puppet/manifests')
-rw-r--r--puppet/manifests/overcloud_volume.pp22
1 files changed, 0 insertions, 22 deletions
diff --git a/puppet/manifests/overcloud_volume.pp b/puppet/manifests/overcloud_volume.pp
index fd9516f..c6234bd 100644
--- a/puppet/manifests/overcloud_volume.pp
+++ b/puppet/manifests/overcloud_volume.pp
@@ -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')
}