From: Emilien Macchi <emilien@redhat.com>
Date: Mon, 4 Jul 2016 16:52:37 +0000 (-0400)
Subject: overcloud_volume: cleanup unused Puppet code
X-Git-Tag: opnfv-6.0.0~1887^2
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=1222eb7e7b6533539cfbe0825dd50ef269202bee;p=apex-tripleo-heat-templates.git

overcloud_volume: cleanup unused Puppet code

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

Change-Id: I3446883cb89dcf179a854e2adef81b899117f66a
---

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')
 }