diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2016-07-05 12:30:34 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2016-07-05 12:30:34 +0000 |
| commit | bfb34ccdee38bc9ec95f054a43dd5541f91f8c9d (patch) | |
| tree | 7f2364ec2d2ee9fb1bc173c727c3f3531a78cae6 | |
| parent | 519b94ff1e2b4d3de563ca28c14cb48a4fbcf34c (diff) | |
| parent | 1006cbbdeab926dd695733f22168e5d2146c49c3 (diff) | |
Merge "volume: deploy snmp using composable role"
| -rw-r--r-- | overcloud.yaml | 1 | ||||
| -rw-r--r-- | puppet/manifests/overcloud_volume.pp | 10 |
2 files changed, 1 insertions, 10 deletions
diff --git a/overcloud.yaml b/overcloud.yaml index 46fbef67..d453f196 100644 --- a/overcloud.yaml +++ b/overcloud.yaml @@ -580,6 +580,7 @@ parameters: - OS::TripleO::Services::CinderVolume - 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 --git a/puppet/manifests/overcloud_volume.pp b/puppet/manifests/overcloud_volume.pp index 7fc27d60..fd9516f2 100644 --- a/puppet/manifests/overcloud_volume.pp +++ b/puppet/manifests/overcloud_volume.pp @@ -47,16 +47,6 @@ if hiera('step') >= 4 { 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') } |