virtualmaster 0.1.1 → 0.1.2

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    virtualmaster (0.1.0)
+    virtualmaster (0.1.1)
       commander (~> 4.1.2)
       deltacloud-client (~> 0.5.0)
       net-ssh (~> 2.3.0)

data/README.mdown

@@ -55,6 +55,14 @@ Virtualmaster CLI can install your SSH keys to a remote machine automatically us
 
 	Try to login using `ssh root@195.140.253.130'
 
+## Instance provisioning with shell scripts
+
+First steps towards automated infrastructure is provision. Using Virtualmaster CLI shell provisioner you can launch a custom shell script once server is created and automate initial setup.
+
+  virtualmaster create demo1 --script ~/setup.sh
+
+Callbacks (like script and identity) can be run at the same time.
+
 ## Instance size
 
 Default hardware profile for instances are defined in the [helpers file](https://github.com/Virtualmaster/virtualmaster-cli/blob/master/lib/vmaster/helpers.rb). Profiles are stored in configuration file when user runs `virtualmaster config`.

data/lib/vmaster/callbacks/shell_provisioner.rb

@@ -0,0 +1,50 @@
+#
+# Shell Provisioner
+#
+
+def copy_file(session, file, destination)
+  session.open_channel do |channel|
+    channel.exec("cat > #{destination}") do |channel, success|
+      channel.on_data do |ch,data|
+        puts data
+      end
+
+      open(file) { |f| channel.send_data(f.read) }
+      channel.eof!
+    end
+  end
+  session.loop
+end
+
+def run_command(session, command)
+  session.open_channel do |channel|
+    channel.on_data do |ch,data|
+      puts data
+    end
+
+    channel.exec command
+  end
+  session.loop
+end
+
+callback :shell_provisioner do
+  option :script, String, 'Setup virtual machine using provided script'
+
+  before :create do |options|
+    abort "Shell script doesn't exist (#{options[:script]})" unless File.exists?(options[:script])
+  end
+
+  after :create do |options, server|
+    script = open(options[:script]) { |f| f.readlines}
+
+    Net::SSH.start(server.public_addresses.first[:address], 'root', :password => options[:password]) do |ssh|
+      destination_path = "/tmp/shell_provisioner.sh"
+
+      copy_file(ssh, options[:script], "/tmp/shell_provisioner.sh")
+      puts
+
+      say "***** running shell provisioner ******"
+      run_command(ssh, "sh /tmp/shell_provisioner.sh")
+    end
+  end
+end

data/lib/vmaster/callbacks/ssh_keys_callback.rb

@@ -29,8 +29,7 @@ callback :ssh_copy_id do
 
     Net::SSH.start(server.public_addresses.first[:address], 'root', :password => options[:password]) do |ssh|
       # TODO exception handling
-      output = ssh.exec!("mkdir ~/.ssh")
-      output = ssh.exec!("echo '#{authorized_key}' >>~/.ssh/authorized_keys")
+      output = ssh.exec!("umask 077 && test -d ~/.ssh || mkdir ~/.ssh && echo '#{authorized_key}' >>~/.ssh/authorized_keys")
     end
   end
 end

data/lib/vmaster/helpers.rb

@@ -64,7 +64,7 @@ module VirtualMaster
     def self.create_instance(name, image_id, profile, realm)
       api = VirtualMaster::CLI.api
 
-      api.create_instance(image_id, {:name => name, :memory => profile[:memory], :storage => profile[:storage], :realm_id => realm})
+      api.create_instance(image_id, {:name => name, :hwp_id => 'default', :memory => profile[:memory], :storage => profile[:storage], :realm_id => realm})
     end
   end
 end

data/lib/vmaster/server_commands.rb

@@ -78,7 +78,7 @@ command :create do |c|
 
     realm = "#{options.zone}-#{options.level}"
 
-    instance = VirtualMaster::Helpers.create_instance(name, image_id, profile, realm) if options.interactive
+    instance = VirtualMaster::Helpers.create_instance(name, image_id, profile, realm) 
 
     # TODO handle exceptions (invalid image/profile, limits, etc.)
 

data/lib/vmaster/version.rb

@@ -1,3 +1,7 @@
 module VirtualMaster
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
+
+  def self.cli_spec_version
+    VERSION.to_f.to_s
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: virtualmaster
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-04-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: commander
-  requirement: &70352789585640 !ruby/object:Gem::Requirement
+  requirement: &70157779658640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 4.1.2
   type: :runtime
   prerelease: false
-  version_requirements: *70352789585640
+  version_requirements: *70157779658640
 - !ruby/object:Gem::Dependency
   name: deltacloud-client
-  requirement: &70352789585100 !ruby/object:Gem::Requirement
+  requirement: &70157779658140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 0.5.0
   type: :runtime
   prerelease: false
-  version_requirements: *70352789585100
+  version_requirements: *70157779658140
 - !ruby/object:Gem::Dependency
   name: terminal-table
-  requirement: &70352789584620 !ruby/object:Gem::Requirement
+  requirement: &70157779657680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 1.4.4
   type: :runtime
   prerelease: false
-  version_requirements: *70352789584620
+  version_requirements: *70157779657680
 - !ruby/object:Gem::Dependency
   name: net-ssh
-  requirement: &70352789583960 !ruby/object:Gem::Requirement
+  requirement: &70157779656940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 2.3.0
   type: :runtime
   prerelease: false
-  version_requirements: *70352789583960
+  version_requirements: *70157779656940
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70352789583320 !ruby/object:Gem::Requirement
+  requirement: &70157779656260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,7 +65,7 @@ dependencies:
         version: '2'
   type: :development
   prerelease: false
-  version_requirements: *70352789583320
+  version_requirements: *70157779656260
 description: Command line interface to Virtualmaster. Control your virtual infrastructure.
 email:
 - radim@laststation.net
@@ -83,6 +83,7 @@ files:
 - lib/vmaster.rb
 - lib/vmaster/callbacks.rb
 - lib/vmaster/callbacks/demo_callback.rb
+- lib/vmaster/callbacks/shell_provisioner.rb
 - lib/vmaster/callbacks/ssh_keys_callback.rb
 - lib/vmaster/cli.rb
 - lib/vmaster/config_command.rb