aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEmilien Macchi <emilien@redhat.com>2016-07-04 12:46:50 -0400
committerEmilien Macchi <emilien@redhat.com>2016-07-04 12:46:50 -0400
commit1006cbbdeab926dd695733f22168e5d2146c49c3 (patch)
treed4c08bf0d4c9822e84c8ae1f1bc0283c320d061d
parentcbb6ae4e7bda60515e0ef85dff1028d038ec132d (diff)
volume: deploy snmp using composable role
Change-Id: Ibc9abf7043c37104d03cd72d882e10cdb53fe6a2
-rw-r--r--overcloud.yaml1
-rw-r--r--puppet/manifests/overcloud_volume.pp10
2 files changed, 1 insertions, 10 deletions
diff --git a/overcloud.yaml b/overcloud.yaml
index 1d5fd8b1..dfe44a94 100644
--- a/overcloud.yaml
+++ b/overcloud.yaml
@@ -604,6 +604,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')
}