From 4bc4171a151ebac2c9f1e42aed7dc23de844e429 Mon Sep 17 00:00:00 2001
From: Yanis Guenane <yanis.guenane@enovance.com>
Date: Mon, 9 Mar 2015 12:17:31 +0100
Subject: Use Cinder multibackend by default

Currently Cinder iscsi backend is configured within the DEFAULT section.
Since we aim to support multibackend, this commit puts the iscsi backend
in its own section and enable it by default configuring it properly.
Also adds a parameter which can be used to disable the default backend.

Co-Authored-By: Giulio Fidente <gfidente@redhat.com>

Change-Id: I05fb44b59829c0afa8a6588956a48320f2f65159
---
 puppet/manifests/overcloud_controller.pp | 16 +++++++++++++++-
 puppet/manifests/overcloud_volume.pp     | 16 +++++++++++++++-
 2 files changed, 30 insertions(+), 2 deletions(-)

(limited to 'puppet/manifests')

diff --git a/puppet/manifests/overcloud_controller.pp b/puppet/manifests/overcloud_controller.pp
index fef749c5..c9af578c 100644
--- a/puppet/manifests/overcloud_controller.pp
+++ b/puppet/manifests/overcloud_controller.pp
@@ -258,11 +258,25 @@ if hiera('step') >= 2 {
   include ::cinder::glance
   include ::cinder::scheduler
   include ::cinder::volume
-  include ::cinder::volume::iscsi
   class {'cinder::setup_test_volume':
     size => join([hiera('cinder_lvm_loop_device_size'), 'M']),
   }
 
+  $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 => $cinder_enabled_backends,
+  }
+
   # swift proxy
   include ::memcached
   include ::swift::proxy
diff --git a/puppet/manifests/overcloud_volume.pp b/puppet/manifests/overcloud_volume.pp
index b433321a..3d7cb490 100644
--- a/puppet/manifests/overcloud_volume.pp
+++ b/puppet/manifests/overcloud_volume.pp
@@ -30,9 +30,23 @@ if count(hiera('ntp::servers')) > 0 {
 
 include ::cinder
 include ::cinder::volume
-include ::cinder::volume::iscsi
 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 => $cinder_enabled_backends,
+}
+
 $snmpd_user = hiera('snmpd_readonly_user_name')
 snmp::snmpv3_user { $snmpd_user:
   authtype => 'MD5',
-- 
cgit 1.2.3-korg