Skip to content

Commit

Permalink
Merge remote-tracking branch 'dell/openstack-os-build' into openstack…
Browse files Browse the repository at this point in the history 
…-os-build
  • Loading branch information
@VictorLowther
VictorLowther committed Mar 5, 2012
2 parents fa1695f + c3f4597 commit 2e6f290
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion barclamps/crowbar
Submodule crowbar updated 1 files
+21 −2 crowbar_framework/app/models/crowbar_service.rb
2 changes: 1 addition & 1 deletion barclamps/nagios
Submodule nagios updated 14 files
+3 −1 chef/cookbooks/nagios/attributes/server.rb
+31 −0 chef/cookbooks/nagios/definitions/nagios_client.rb
+103 −0 chef/cookbooks/nagios/files/default/plugins/check_ipmi.pl
+3 −3 chef/cookbooks/nagios/files/default/plugins/check_megaraid_sas
+43 −15 chef/cookbooks/nagios/files/default/plugins/check_sas2ircu
+1 −0 chef/cookbooks/nagios/metadata.rb
+33 −0 chef/cookbooks/nagios/recipes/monitor_hw.rb
+30 −10 chef/cookbooks/nagios/recipes/monitor_hw_client.rb
+2 −2 chef/cookbooks/nagios/recipes/server.rb
+4 −1 chef/cookbooks/nagios/templates/default/monitor_hw.cfg.erb
+2 −3 chef/cookbooks/nagios/templates/default/monitor_hw_nrpe.cfg.erb
+2 −1 chef/data_bags/crowbar/bc-template-nagios.json
+2 −2 chef/data_bags/crowbar/bc-template-nagios.schema
+8 −1 crowbar_framework/app/models/nagios_service.rb

0 comments on commit 2e6f290

Please sign in to comment.