From 0a9a31432659bc473597e0e3072c26e06a4527c6 Mon Sep 17 00:00:00 2001 From: Guilhem Lettron Date: Tue, 9 Apr 2013 14:50:08 +0200 Subject: [PATCH] remove useless require json in mon and add it in libraries --- libraries/default.rb | 1 + recipes/mon.rb | 2 -- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/libraries/default.rb b/libraries/default.rb index 69ae4cd..fec3c17 100644 --- 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 b7bf0e6..116eb41 100644 --- 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"