Permalink
Browse files

rolled back '7037953 Merge pull request #27 from mohitsethi/OC-4235' …

…because it broke knife rackspace server create
  • Loading branch information...
1 parent c300a7f commit e518399f4aedcf3f302e4080bc0f467b6633aa8b @mattray mattray committed Nov 8, 2012
Showing with 5 additions and 2 deletions.
  1. +2 −2 lib/chef/knife/rackspace_base.rb
  2. +3 −0 lib/chef/knife/rackspace_server_create.rb
@@ -16,6 +16,8 @@
# limitations under the License.
#
+require 'chef/knife'
+
class Chef
class Knife
module RackspaceBase
@@ -30,9 +32,7 @@ def self.included(includer)
require 'fog'
require 'net/ssh/multi'
require 'readline'
- require 'chef/knife'
require 'chef/json_compat'
- Chef::Knife.load_deps
end
option :rackspace_api_key,
@@ -26,6 +26,9 @@ class RackspaceServerCreate < Knife
include Knife::RackspaceBase
deps do
+ require 'fog'
+ require 'readline'
+ require 'chef/json_compat'
require 'chef/knife/bootstrap'
Chef::Knife::Bootstrap.load_deps
end

0 comments on commit e518399

Please sign in to comment.