X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=puppet%2Fmanifests%2Fovercloud_volume.pp;h=d1f6d6a58fbc636e6b29f5113b22548c1264e042;hb=e78e1c8d9b5a7ebf327987b22091bff3ed42d1c1;hp=b433321af8838aca8dd44783bdb03b3a4260dfe3;hpb=6b5ac01d2e61af9efddd01b58bfc0f6cd1e8518f;p=apex-tripleo-heat-templates.git

diff --git a/puppet/manifests/overcloud_volume.pp b/puppet/manifests/overcloud_volume.pp
index b433321a..d1f6d6a5 100644
--- a/puppet/manifests/overcloud_volume.pp
+++ b/puppet/manifests/overcloud_volume.pp
@@ -13,26 +13,35 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-if str2bool(hiera('disable_package_install', 'false')) {
-  case $::osfamily {
-    'RedHat': {
-      Package { provider => 'norpm' } # provided by tripleo-puppet
-    }
-    default: {
-      warning('disable_package_install option not supported.')
-    }
-  }
-}
+include tripleo::packages
+
+create_resources(sysctl::value, hiera('sysctl_settings'), {})
 
 if count(hiera('ntp::servers')) > 0 {
   include ::ntp
 }
 
 include ::cinder
+include ::cinder::config
+include ::cinder::glance
 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',
@@ -42,3 +51,5 @@ class { 'snmp':
   agentaddress => ['udp:161','udp6:[::1]:161'],
   snmpd_config => [ join(['rouser ', hiera('snmpd_readonly_user_name')]), 'proc  cron', 'includeAllDisks  10%', 'master agentx', 'trapsink localhost public', 'iquerySecName internalUser', 'rouser internalUser', 'defaultMonitors yes', 'linkUpDownNotifications yes' ],
 }
+
+hiera_include('volume_classes')
\ No newline at end of file