diff options
author | Emilien Macchi <emilien@redhat.com> | 2016-07-04 12:52:37 -0400 |
---|---|---|
committer | Emilien Macchi <emilien@redhat.com> | 2016-07-04 12:53:09 -0400 |
commit | 1222eb7e7b6533539cfbe0825dd50ef269202bee (patch) | |
tree | cdcf993f7cc4c362b3523e7bcceac1e6e6b71b86 | |
parent | 1006cbbdeab926dd695733f22168e5d2146c49c3 (diff) |
overcloud_volume: cleanup unused Puppet code
overcloud_volume contains some code that is already deployed by
OS::TripleO::Services::CinderVolume service.
Change-Id: I3446883cb89dcf179a854e2adef81b899117f66a
-rw-r--r-- | puppet/manifests/overcloud_volume.pp | 22 |
1 files changed, 0 insertions, 22 deletions
diff --git a/puppet/manifests/overcloud_volume.pp b/puppet/manifests/overcloud_volume.pp index fd9516f2..c6234bd3 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') } |