Move NTP and Memacache respectively into step 1 and step 2

[apex-tripleo-heat-templates.git] / puppet / manifests / overcloud_volume.pp

diff --git a/puppet/manifests/overcloud_volume.pp b/puppet/manifests/overcloud_volume.pp
index b433321..3d7cb49 100644 (file)
--- 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',