knife-clodo 0.1.5 → 0.1.6

data/README

@@ -2,14 +2,11 @@ knife-clodo is a knife plugin for Clodo.Ru API.
 
 It uses fog library to interact with API.
 
-At this time fog's provider for clodo is not in upstream Git,
-so you need to manually download the sources of patched to 
-support clodo fog source tree, build and install gem from it.
+Starting from fog-1.1.2, fog's provider for clodo presented
+in upstream Git, so installation and setup is as simple as 
+running "gem install knife-clodo" from command line, and
+adding next lines in your knife's configuration file:
 
-
-Usage is simple as:
-
-Write authorization data in your knife.rb as below:
 knife[:clodo_username]		=	'your@registration.email.net'     # Your email used to authorise in clodo.ru billing.
 knife[:clodo_api_key]		=	'XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' # Your API key
 knife[:clodo_api_auth_url]	=	'testapi.kh.clodo.ru'             # Domain name of API server.
@@ -23,11 +20,10 @@ knife clodo server list
 (To list your virtual servers)
 
 knife clodo server start --server=10474
-(where 10474 in --server=10474 is an ID of virtual server to 
-start)
+(where 10474 is an ID of virtual server to start)
 
 knife clodo server start --all
-(that will request start for all the servers that is not in 
+(that will request to start all of the servers that is not in 
 "is_running" or "is_request" state)
 
 knife clodo server create -d debian6apt -r "recipe[vds-performance-tests]" --server-disk=5 --server-memory=256 --server-memory-max=512 -I 541

data/knife-clodo.gemspec

@@ -1,8 +1,8 @@
 Gem::Specification.new do |spec|
   spec.name = 'knife-clodo'
-  spec.version = '0.1.5'
+  spec.version = '0.1.6'
   spec.summary = 'Clodo.Ru knife plugin'
-  spec.add_dependency('fog', '>= 0.11.0')
+  spec.add_dependency('fog', '>= 1.1.2')
   spec.description = <<-EOF
 	Knife plugin for Clodo.Ru cloud provider.
 EOF

data/lib/chef/knife/bootstrap/debian6apt.erb

@@ -1,7 +1,9 @@
 bash -c '
 <%= "export http_proxy=\"#{knife_config[:bootstrap_proxy]}\"" if knife_config[:bootstrap_proxy] -%>
 
-while [ -d /var/adm/autoinstall/init.d -a -e /var/adm/autoinstall/init.d/* ] do
+ip route flush proto kernel scope link
+
+while [ -e /var/adm/autoinstall/init.d/* ]; do
 	echo "Autoinstallation still in progress. Waiting 5sec...";
 	sleep 5;
 done
@@ -39,7 +41,7 @@ rm /tmp/validation.pem
 <% end -%>
 
 <% if @config[:chef_node_name] %>
-[ `grep -qx "node_name \"<%= @config[:chef_node_name] %>\"" /etc/chef/client.rb` ] || echo "node_name \"<%= @config[:chef_node_name] %>\"" >> /etc/chef/client.rb
+[ `grep -qx "node_name " /etc/chef/client.rb` ] || echo "node_name \"$(hostname -f)\"" >> /etc/chef/client.rb
 <% end -%>
 
 <% if knife_config[:bootstrap_proxy] %>

data/lib/chef/knife/clodo_server_create.rb

@@ -112,6 +112,12 @@ class Chef
       :proc => lambda { |o| o.split(/[\s,]+/) },
       :default => []
 
+      option :autoupdate,
+      :long => "--auto-update",
+      :description => "Allow clodo panel to autoupdate OS packages at first run? (default is do not allow)",
+      :proc => {|a| Chef::Config[:knife][:autoupdate] = 1 },
+      :default => 0
+
       def tcp_test_ssh(hostname)
         tcp_socket = TCPSocket.new(hostname, 22)
         readable = IO.select([tcp_socket], nil, nil, 5)
@@ -150,7 +156,8 @@ class Chef
           :vps_memory_max => locate_config_value(:server_memory_max),
           :vps_hdd        => locate_config_value(:server_disk),
           :vps_admin      => locate_config_value(:server_support_level),
-          :vps_os         => locate_config_value(:image)
+          :vps_os         => locate_config_value(:image),
+          :vps_autoupdate => locate_config_value(:autoupdate)
         }
 
         options[:vps_title] = config[:server_name] if config[:server_name]

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: knife-clodo
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 23
   prerelease: 
   segments: 
   - 0
   - 1
-  - 5
-  version: 0.1.5
+  - 6
+  version: 0.1.6
 platform: ruby
 authors: 
 - Stepan G. Fedorov
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-24 00:00:00 Z
+date: 2011-12-19 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: fog
@@ -25,12 +25,12 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 51
+        hash: 23
         segments: 
-        - 0
-        - 11
-        - 0
-        version: 0.11.0
+        - 1
+        - 1
+        - 2
+        version: 1.1.2
   type: :runtime
   version_requirements: *id001
 description: "\tKnife plugin for Clodo.Ru cloud provider.\n"