remove useless require json in mon and add it in libraries

diff --git a/libraries/default.rb b/libraries/default.rb
index 69ae4cd20a4cfd3ec53d362c10407f8d4b603eaf..fec3c1789814480e832860331de981e2ee1514b0 100644 (file)
--- a/libraries/default.rb
+++ b/libraries/default.rb
@@ -1,4 +1,5 @@
 require 'ipaddr'
+require 'json'
 
 def is_crowbar?()
   return defined?(Chef::Recipe::Barclamp) != nil

diff --git a/recipes/mon.rb b/recipes/mon.rb
index b7bf0e6510e548d9d341a374e30bfd784004b41b..116eb418569632c926943a025b96e43ef0d61de1 100644 (file)
--- a/recipes/mon.rb
+++ b/recipes/mon.rb
@@ -14,8 +14,6 @@
 #  different and are created in
 #  /var/lib/ceph/bootstrap-{osd,mds}/ceph.keyring
 
-require 'json'
-
 include_recipe "ceph::default"
 include_recipe "ceph::conf"