Permalink
Browse files

Merge branch 'master' into zenoss

Conflicts:
	zenoss/recipes/server.rb
	zenoss/resources/zenbatchload.rb
  • Loading branch information...
2 parents e5f5ac0 + e40a39c commit 2e6e0c3621283bf6315a606789e0ef85ff0384dc @smith smith committed May 12, 2011
@@ -34,7 +34,7 @@
end
# Gems
-%w{ json repl rake }.each do |pkg|
+%w{ json rake rb-readline repl }.each do |pkg|
gem_package pkg
end
@@ -167,7 +167,7 @@
},
"maintainer": "Opscode, Inc.",
"long_description": "",
- "version": "0.7.0",
+ "version": "0.7.1",
"recommendations": {
},
"recipes": {
View
@@ -2,7 +2,7 @@
maintainer_email "cookbooks@opscode.com"
license "Apache 2.0"
description "Installs and configures Zenoss and registers nodes as devices"
-version "0.7"
+version "0.7.1"
depends "apt"
depends "openssh"
depends "openssl"
@@ -11,7 +11,6 @@
recipe "zenoss::client", "Includes the `openssh` recipe and adds the device to the Zenoss server for monitoring."
recipe "zenoss::server", "Installs Zenoss, handling and configuring all the dependencies while adding Device Classes, Groups, Systems and Locations. All nodes using the `zenoss::client` recipe are added for monitoring."
-
#start with just the .deb, perhaps switch to stack installer and/or .rpm
%w{ debian ubuntu redhat centos scientific }.each do |os|
supports os
@@ -4,6 +4,9 @@
locations = new_resource.locations
groups = new_resource.groups
batch = ""
+ Chef::Log.debug "zenbatchload devices:#{devices}"
+ Chef::Log.debug "zenbatchload locations:#{locations}"
+ Chef::Log.debug "zenbatchload groups:#{groups}"
#sort the hash and construct the batchload file
devices.keys.sort!.each do |dclass|
batch += "#{dclass}\n"
@@ -236,8 +236,8 @@
end
end
end
-zenoss_zenbatchload 'devices' do
- devices devs
+zenoss_zenbatchload "zenbatchloading devices" do
+ devices devices
locations locationlist
groups grouplist
action :run
@@ -1,6 +1,5 @@
actions :run
-attribute :name, :kind_of => String, :default => '', :name_attribute => true
attribute :devices, :kind_of => Hash, :default => {}
attribute :locations, :kind_of => Array, :default => []
attribute :groups, :kind_of => Array, :default => []

0 comments on commit 2e6e0c3

Please sign in to comment.