X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=puppet%2Fmanifests%2Fovercloud_volume.pp;h=7f24959a1f94f8cfa4a38ea7dec9b8af787ad8e7;hb=37b9f62720e537cdd1e8a704a07907cb91736750;hp=edfeaeca539fd057919f466bc9f20238a7eaf5ef;hpb=2e922fdb33a4e9327c86c75806be6312e0a262e3;p=apex-tripleo-heat-templates.git

diff --git a/puppet/manifests/overcloud_volume.pp b/puppet/manifests/overcloud_volume.pp
index edfeaeca..7f24959a 100644
--- a/puppet/manifests/overcloud_volume.pp
+++ b/puppet/manifests/overcloud_volume.pp
@@ -13,16 +13,7 @@
 # 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'), {})
 
@@ -31,6 +22,7 @@ if count(hiera('ntp::servers')) > 0 {
 }
 
 include ::cinder
+include ::cinder::config
 include ::cinder::glance
 include ::cinder::volume
 include ::cinder::setup_test_volume
@@ -55,7 +47,10 @@ snmp::snmpv3_user { $snmpd_user:
   authtype => 'MD5',
   authpass => hiera('snmpd_readonly_user_password'),
 }
-class { 'snmp':
+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')
+package_manifest{'/var/lib/tripleo/installed-packages/overcloud_volume': ensure => present}