X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=puppet%2Fmanifests%2Fovercloud_volume.pp;h=7c7da5865b333cef849898f51a90771ceb24449f;hb=e75563319fa2984256ff569a6eb2e4e980d80f4f;hp=2bdd8a9cf0575070fc226e6f8daba9e15854be22;hpb=83fd16ecf46f9848247ea9676cacf195db71da21;p=apex-tripleo-heat-templates.git

diff --git a/puppet/manifests/overcloud_volume.pp b/puppet/manifests/overcloud_volume.pp
index 2bdd8a9c..7c7da586 100644
--- a/puppet/manifests/overcloud_volume.pp
+++ b/puppet/manifests/overcloud_volume.pp
@@ -16,42 +16,9 @@
 include ::tripleo::packages
 include ::tripleo::firewall
 
-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::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',
-  authpass => hiera('snmpd_readonly_user_password'),
-}
-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' ],
+if hiera('step') >= 4 {
+  hiera_include('volume_classes')
 }
 
-hiera_include('volume_classes')
-package_manifest{'/var/lib/tripleo/installed-packages/overcloud_volume': ensure => present}
+$package_manifest_name = join(['/var/lib/tripleo/installed-packages/overcloud_volume', hiera('step')])
+package_manifest{$package_manifest_name: ensure => present}