From: Jenkins <jenkins@review.openstack.org>
Date: Wed, 6 Jul 2016 18:24:26 +0000 (+0000)
Subject: Merge "Add kernel service"
X-Git-Tag: opnfv-6.0.0~1882
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=8fae8110073eca5dd869b7bdfc6627498a45b1c7;p=apex-tripleo-heat-templates.git

Merge "Add kernel service"
---

8fae8110073eca5dd869b7bdfc6627498a45b1c7
diff --cc overcloud.yaml
index d453f196,7e0bf335..11ea1bdb
--- a/overcloud.yaml
+++ b/overcloud.yaml
@@@ -578,9 -580,9 +580,10 @@@ parameters
    BlockStorageServices:
      default:
        - OS::TripleO::Services::CinderVolume
+       - OS::TripleO::Services::Kernel
        - OS::TripleO::Services::Ntp
        - OS::TripleO::Services::Timezone
 +      - OS::TripleO::Services::Snmp
      description: A list of service resources (configured in the Heat
                   resource_registry) which represent nested stacks
                   for each service that should get installed on the BlockStorage nodes.
diff --cc puppet/manifests/overcloud_volume.pp
index c6234bd3,789f4700..7c7da586
--- a/puppet/manifests/overcloud_volume.pp
+++ b/puppet/manifests/overcloud_volume.pp
@@@ -16,15 -16,39 +16,7 @@@
  include ::tripleo::packages
  include ::tripleo::firewall
  
- if hiera('step') >= 1 {
- 
-   create_resources(kmod::load, hiera('kernel_modules'), {})
-   create_resources(sysctl::value, hiera('sysctl_settings'), {})
-   Exec <| tag == 'kmod::load' |>  -> Sysctl <| |>
- 
- }
- 
  if hiera('step') >= 4 {
 -
 -  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 => union($cinder_enabled_backends, hiera('cinder_user_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(['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')
  }