Merge "Explode Loadbalancer role into HAproxy + keepalived"

[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 2bdd8a9..134dc43 100644 (file)
--- a/puppet/manifests/overcloud_volume.pp
+++ b/puppet/manifests/overcloud_volume.pp
@@ -16,12 +16,16 @@
 include ::tripleo::packages
 include ::tripleo::firewall
 
+create_resources(kmod::load, hiera('kernel_modules'), {})
 create_resources(sysctl::value, hiera('sysctl_settings'), {})
+Exec <| tag == 'kmod::load' |>  -> Sysctl <| |>
 
 if count(hiera('ntp::servers')) > 0 {
   include ::ntp
 }
 
+include ::timezone
+
 include ::cinder
 include ::cinder::config
 include ::cinder::glance
@@ -40,7 +44,7 @@ if $cinder_enable_iscsi {
 
 $cinder_enabled_backends = any2array($cinder_iscsi_backend)
 class { '::cinder::backends' :
-  enabled_backends => $cinder_enabled_backends,
+  enabled_backends => union($cinder_enabled_backends, hiera('cinder_user_enabled_backends')),
 }
 
 $snmpd_user = hiera('snmpd_readonly_user_name')
@@ -50,7 +54,7 @@ snmp::snmpv3_user { $snmpd_user:
 }
 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' ],
+  snmpd_config => [ join(['createUser ', hiera('snmpd_readonly_user_name'), ' MD5 "', hiera('snmpd_readonly_user_password'), '"']), 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')