Merge "Ensure CinderStorage nodes use internalURL as catalog_info"

[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 3d7cb49..f5c9ae5 100644 (file)
--- a/puppet/manifests/overcloud_volume.pp
+++ b/puppet/manifests/overcloud_volume.pp
@@ -24,11 +24,15 @@ if str2bool(hiera('disable_package_install', 'false')) {
   }
 }
 
+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
 
@@ -56,3 +60,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