openstack/tripleo-heat-templates
Code Issues Proposed changes

Merge "Add missing createUser line to /etc/snmp/snmpd.conf"

Browse Source
This commit is contained in:
Jenkins 2016-03-09 12:54:24 +00:00 committed by Gerrit Code Review
commit 84f7ec83b8
5 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
puppet/manifests/overcloud_compute.pp
View File

@ -163,7 +163,7 @@ snmp::snmpv3_user { $snmpd_user:
} }
class { '::snmp': class { '::snmp':
agentaddress => ['udp:161','udp6:[::1]:161'], 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' ], 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('compute_classes') hiera_include('compute_classes')

2
puppet/manifests/overcloud_controller.pp
View File

@ -603,7 +603,7 @@ if hiera('step') >= 3 {
} }
class { '::snmp': class { '::snmp':
agentaddress => ['udp:161','udp6:[::1]:161'], 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' ], 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('controller_classes') hiera_include('controller_classes')

2
puppet/manifests/overcloud_controller_pacemaker.pp
View File

@ -1097,7 +1097,7 @@ if hiera('step') >= 3 {
} }
class { '::snmp': class { '::snmp':
agentaddress => ['udp:161','udp6:[::1]:161'], 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' ], 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('controller_classes') hiera_include('controller_classes')

2
puppet/manifests/overcloud_object.pp
View File

@ -50,7 +50,7 @@ snmp::snmpv3_user { $snmpd_user:
} }
class { '::snmp': class { '::snmp':
agentaddress => ['udp:161','udp6:[::1]:161'], 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' ], 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('object_classes') hiera_include('object_classes')

2
puppet/manifests/overcloud_volume.pp
View File

@ -54,7 +54,7 @@ snmp::snmpv3_user { $snmpd_user:
} }
class { '::snmp': class { '::snmp':
agentaddress => ['udp:161','udp6:[::1]:161'], 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' ], 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') hiera_include('volume_classes')