vagrant-ganeti 0.0.1 → 0.1.1

data/README.md

@@ -2,20 +2,20 @@
 This is a Vagrant 1.2+ plugin that adds an Ganeti provider to Vagrant, allowing Vagrant to control and provision 
 machines in Ganeti.
 
-NOTE: This plugin requires Vagrant 1.2
-NOTE: This project is work in progress, there are lot of things which might not work yet.
+**NOTE:** This plugin requires **Vagrant 1.2**
 
-## Installation
+**NOTE:** This project is work in progress, there are lot of things which might not work yet.
 
-Build the Gem:
+## Installation
 
-    $  gem build 'vagrant-plugin-ganeti.gemspec'
+Building the Gem from source:
 
+    $  gem build 'vagrant-ganeti.gemspec'
 
 
-Install using standard Vagrant 1.1+ plugin installation methods. After installing, vagrant up and specify the ganeti provider. An example is shown below.
+Alternatively you could, Install using standard Vagrant 1.1+ plugin installation methods. After installing, vagrant up and specify the ganeti provider. An example is shown below.
 
-    $  vagrant plugin install vagrant-plugin-ganeti-0.0.1.gem
+    $  vagrant plugin install vagrant-ganeti
 
 ## Usage
 
@@ -41,25 +41,28 @@ And then make a Vagrantfile that looks like the following, filling in your infor
         ganeti.os_type = "image+debian-squeeze"
         ganeti.instance_name = "gimager3.organisation.org"
         ganeti.pnode = "gnode.organisation.org"
-        ganeti.nics = [{"ip"=>"10.10.10.100"}]
         ganeti.disks =[{"size"=>"8000"}] 
         ganeti.disk_template = "plain"
-        override.ssh.username = "User name of the default user "
-        override.ssh.private_key_path = "Path to your private key"
+        override.ssh.username = "root"
       end
     end
 
 
 And then run vagrant up --provider=ganeti.
+        
+This will start an  instance in the Ganeti Cluster.
 
-This will start an  instance in the Ganeti Cluster. And assuming your SSH information was filled in properly within your Vagrantfile, SSH and provisioning will work as well.
+Other overridable settings include 
+
+        override.ssh.username = "User Name"
+        override.ssh.private_key_path = "Path to your private key"
 
 If you have issues with SSH connecting, make sure that the instances are being launched with a security group that allows SSH access.
 
 ## Box Format
 
 Every provider in Vagrant must introduce a custom box format. This
-provider introduces `aws` boxes. You can view an example box in
+provider introduces `ganeti` boxes. You can view an example box in
 the [example_box/ directory](https://github.com/osuosl/vagrant-plugin-ganeti/master/example_box/).
 That directory also contains instructions on how to build a box.
 
@@ -70,38 +73,44 @@ provider-specific configuration for this provider.
 ## Configuration
 
 This provider exposes quite a few provider-specific configuration options:
-
-* `rapi_user` - The username for accessing the RAPI. REQUIRED
-* `rapi_pass` - The password for the corrensponding user. REQUIRED
-* `cluster` - The host address of the master Ganeti Node. REQUIRED
-* `os_type` - The OS that needs to be booted up. Note : This will override the default box . OPTIONAL
-* `mode` - Mode of creation. Defaults to create. OPTIONAL
-* `instance_name` - The name of the instance. REQUIRED
-* `pnode` - The primary node where instance needs to be created. Defaults to None. OPTIONAL
-* `snode` - The Secondary node in case of drbd is used. Defaults to None. OPTIONAL
-* `nics` - Network configuration. REQUIRED
-* `disks` - The Size of the Disks . Defaults to 8 G . OPTIONAL
-* `disk_template` - The type of the disk template. Defaults to plain . OPTIONAL
-* `iallocator` - The name of the iallocator policy. Defaults to cluster default . OPTIONAL
-* `memory` - The size of the memory. Defaults to plain . OPTIONAL
-* `vcpus` - The No of VCPUS . Defaults to None . OPTIONAL
-* `ip_check` - Either 'true' or 'false' (Without quotes). Defaults to true . OPTIONAL
-* `name_check` - Either 'true' or 'false' (Without quotes) . Defaults to true . OPTIONAL
-
-
-hvparams settings
-* `boot_order` - Defaults to None . OPTIONAL
-* `cdrom_image_path` - Defaults to None . OPTIONAL
-* `nic_type` - Defaults to None . OPTIONAL
-* `disk_type` - Defaults to None . OPTIONAL
-* `cpu_type` - Defaults to None . OPTIONAL
-* `kernel_path` - Defaults to None . OPTIONAL
-* `kernel_args` - Defaults to None . OPTIONAL
-* `initrd_path` - Defaults to None . OPTIONAL
-* `root_path` - Defaults to None . OPTIONAL
-* `serial_console` - Defaults to None . OPTIONAL
-* `kvm_flag` - Defaults to None . OPTIONAL
-
+### Required Parameters
+* `rapi_user` - The username for accessing the RAPI. 
+* `rapi_pass` - The password for the corrensponding user. 
+* `cluster` - The host address of the master Ganeti Node. 
+* `instance_name` - The name of the instance. 
+
+### Optional Parameters
+* `os_type` - The OS that needs to be booted up. **Note :** This will override the default box . 
+* `mode` - Mode of creation. Defaults to create. 
+* `pnode` - The primary node where instance needs to be created. Defaults to None. 
+* `snode` - The Secondary node in case of drbd is used. Defaults to None. 
+* `nics` - Network configuration. 
+    * List of (Dictionary with keys of (OneOf bridge, name, ip, vlan, mac, link, mode, network) and values of (None or String)
+* `disks` - The Size of the Disks . Defaults to 8 G . 
+    * List of (Dictionary with keys of (OneOf name, vg, adopt, spindles, mode, provider, metavg, size) and values of (NonEmptyString or Integer)
+* `disk_template` - The type of the disk template. Defaults to plain . 
+* `iallocator` - The name of the iallocator policy. Defaults to cluster default . 
+* `memory` - The size of the memory. Defaults to plain . 
+* `vcpus` - The No of VCPUS . Defaults to None . 
+* `ip_check` - Either 'true' or 'false' (Without quotes). Defaults to true . 
+* `name_check` - Either 'true' or 'false' (Without quotes) . Defaults to true . 
+
+More about Ganeti Instance parameters can be found [here](http://docs.ganeti.org/ganeti/current/html/rapi.html#id138)
+
+####hvparams settings
+* `boot_order` - Defaults to None . 
+* `cdrom_image_path` - Defaults to None . 
+* `nic_type` - Defaults to None . 
+* `disk_type` - Defaults to None . 
+* `cpu_type` - Defaults to None . 
+* `kernel_path` - Defaults to None . 
+* `kernel_args` - Defaults to None . 
+* `initrd_path` - Defaults to None . 
+* `root_path` - Defaults to None . 
+* `serial_console` - Defaults to None . 
+* `kvm_flag` - Defaults to None . 
+
+More about hvparam settings can be found [here](http://docs.ganeti.org/ganeti/current/man/gnt-instance.html)
 
 ## Networks
 
@@ -119,6 +128,31 @@ the remote machine over SSH.
 This is good enough for all built-in Vagrant provisioners (shell,
 chef, and puppet) to work!
 
+## Advanced Examples 
+#### Having Multiple Disks
+
+    Vagrant.configure("2") do |config|
+      config.vm.box = "ganeti"
+      config.vm.provider :ganeti do |ganeti, override|
+        .....
+        ganeti.disks =[{"size"=>"8000"},{"size"=>"16000"}] 
+        .....
+      end
+    end
+This creates two disks in the instance one of 8G and another of 16G.
+
+#### Having Multiple Nics
+
+    Vagrant.configure("2") do |config|
+      config.vm.box = "ganeti"
+      config.vm.provider :ganeti do |ganeti, override|
+        .....
+        ganeti.nics =[{"ip"=> "198.51.100.4"}, {"link"=> "br0" ,"ip"=> "10.10.100.4"}, {"ip"=> "10.11.100.4"}]
+        .....
+      end
+    end
+This creates 3 nic interfaces having ip addresses **198.51.100.4** , **10.10.100.4** and **10.11.100.4** .
+Configuration parameter **nics** must be List of - Dictionary with keys of (OneOf bridge, name, ip, vlan, mac, link, mode, network)
 
 ## TODO
 

data/example_box/Vagrantfile

@@ -3,6 +3,6 @@
 
 Vagrant.configure("2") do |config|
   config.vm.provider :ganeti do |ganeti|
-    ganeti.os_name = "image+debian-squeeze"
+    ganeti.os_type = "image+debian-squeeze"
   end
 end

data/lib/{vagrant-plugin-ganeti.rb → vagrant-ganeti.rb}

@@ -1,11 +1,11 @@
 require "pathname"
 
-require "vagrant-plugin-ganeti/plugin"
-require "vagrant-plugin-ganeti/util/ganeti_client"
+require "vagrant-ganeti/plugin"
+require "vagrant-ganeti/util/ganeti_client"
 
 module VagrantPlugins
   module GANETI
-    lib_path = Pathname.new(File.expand_path("../vagrant-plugin-ganeti", __FILE__))
+    lib_path = Pathname.new(File.expand_path("../vagrant-ganeti", __FILE__))
     autoload :Action, lib_path.join("action")
     autoload :Errors, lib_path.join("errors")
 

data/lib/{vagrant-plugin-ganeti → vagrant-ganeti}/action/remove_instance.rb

@@ -13,11 +13,27 @@ module VagrantPlugins
 
         def call(env)
 	  server = env[:ganeti_compute]
-          env[:ui].info("Removing the instance#{server.info['instance_name']}")
-	  server.instance_terminate
+	  createjob = server.instance_terminate
           # set machine id to nil
           env[:machine].id = nil
 
+	  env[:ui].info("Removing the instance #{server.info['instance_name']}")
+	  while true
+		status =  server.is_job_ready(createjob)
+
+		if  status == "error"
+			env[:ui].info("Error Removing instance")
+			break
+		elsif status == "running"
+			#Waiting for the message to succeed
+			sleep(15)
+		elsif status  == "success"
+	    		env[:ui].info("Instance #{server.info['instance_name']} Sucessfully Removed")
+			break
+		end
+	
+            end
+
           @app.call(env)
         end
       end

data/lib/{vagrant-plugin-ganeti → vagrant-ganeti}/action/run_instance.rb

@@ -53,7 +53,7 @@ module VagrantPlugins
             		bootinstancejob = client.start_instance()
 			sleep(3)
 		      	if client.is_job_ready(bootinstancejob) == "success" 
-				env[:machine].id = client.info['nics'][0]['ip']
+				env[:machine].id = client.info['instance_name']
 			        env[:ui].info( "#{ env[:machine].id}")
 				env[:ui].info("Instance Started Successfully")
 		        else
@@ -62,7 +62,7 @@ module VagrantPlugins
 			break
 		elsif status == "already_exists"
 			env[:ui].info( "Instance already Exists. Use Vagrant SSH to login .\nUse 'vagrant destroy' and 'vagrant up' again to create instance afresh")	
-			env[:machine].id = client.info['nics'][0]['ip']
+			env[:machine].id = client.info['instance_name']
 			break
 		end
 	

data/lib/{vagrant-plugin-ganeti → vagrant-ganeti}/config.rb

@@ -290,7 +290,6 @@ module VagrantPlugins
         errors << I18n.t("vagrant_ganeti.config.disks_required") if @disks == nil
 	errors << I18n.t("vagrant_ganeti.config.instance_name_required") if @instance_name.nil?
         errors << I18n.t("vagrant_ganeti.config.mode_required") if @mode.nil?
-	errors << I18n.t("vagrant_ganeti.config.nics_required") if @nics.nil?
 	errors << I18n.t("vagrant_ganeti.config.pnode_required") if @pnode.nil? and  @iallocator.nil?
 	errors << I18n.t("vagrant_ganeti.config.snode_required") if @snode.nil? and  @disk_template == "drbd" and @iallocator.nil?
    	{ "GANETI Provider" => errors }

data/lib/{vagrant-plugin-ganeti → vagrant-ganeti}/util/ganeti_client.rb

@@ -106,7 +106,7 @@ module VagrantPlugins
 		      # response = http.send_request("GET",url)
 		   rescue => e
 		        puts "Error sending request"
-			puts "#{e.message}"
+	#		puts "#{e.message}"
 			       
 		    else
 		        case response

data/lib/{vagrant-plugin-ganeti → vagrant-ganeti}/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module GANETI
-    VERSION = "0.0.1"
+    VERSION = "0.1.1"
   end
 end

data/{vagrant-plugin-ganeti.gemspec → vagrant-ganeti.gemspec}

@@ -1,18 +1,18 @@
 $:.unshift File.expand_path("../lib", __FILE__)
-require "vagrant-plugin-ganeti/version"
+require "vagrant-ganeti/version"
 
 Gem::Specification.new do |s|
   s.name          = "vagrant-ganeti"
   s.version       = VagrantPlugins::GANETI::VERSION
   s.platform      = Gem::Platform::RUBY
-  s.authors       = "Ahmed Shabib,Lance Albertson"
+  s.authors       = "AHMED Shabib"
   s.email         = "reachshabib@gmail.com"
   s.homepage      = "http://www.vagrantup.com"
   s.summary       = "Enables Vagrant to manage machines in Ganeti"
   s.description   = "Enables Vagrant to manage machines in Ganeti."
 
   s.required_rubygems_version = ">= 1.3.6"
-  s.rubyforge_project         = "vagrant-plugin-ganeti"
+  s.rubyforge_project         = "vagrant-ganeti"
 
   s.add_development_dependency "rake"
   s.add_development_dependency "rspec-core", "~> 2.12.2"

metadata

@@ -1,21 +1,21 @@
 --- !ruby/object:Gem::Specification 
 name: vagrant-ganeti
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 25
   prerelease: 
   segments: 
   - 0
-  - 0
   - 1
-  version: 0.0.1
+  - 1
+  version: 0.1.1
 platform: ruby
 authors: 
-- Ahmed Shabib,Lance Albertson
+- AHMED Shabib
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2013-08-31 00:00:00 Z
+date: 2013-09-23 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rake
@@ -89,40 +89,41 @@ extra_rdoc_files: []
 
 files: 
 - README.md
-- lib/vagrant-plugin-ganeti/util/timer.rb
-- lib/vagrant-plugin-ganeti/util/ganeti_client.rb
-- lib/vagrant-plugin-ganeti/action/message_already_created.rb
-- lib/vagrant-plugin-ganeti/action/message_will_not_destroy.rb
-- lib/vagrant-plugin-ganeti/action/connect_ganeti.rb
-- lib/vagrant-plugin-ganeti/action/unlink_server.rb
-- lib/vagrant-plugin-ganeti/action/remove_instance.rb
-- lib/vagrant-plugin-ganeti/action/is_created.rb
-- lib/vagrant-plugin-ganeti/action/warn_networks.rb
-- lib/vagrant-plugin-ganeti/action/read_state.rb
-- lib/vagrant-plugin-ganeti/action/timed_provision.rb
-- lib/vagrant-plugin-ganeti/action/run_instance.rb
-- lib/vagrant-plugin-ganeti/action/message_not_created.rb
-- lib/vagrant-plugin-ganeti/action/read_ssh_info.rb
-- lib/vagrant-plugin-ganeti/action/is_reachable.rb
-- lib/vagrant-plugin-ganeti/action/sync_folders.rb
-- lib/vagrant-plugin-ganeti/action/message_not_reachable.rb
-- lib/vagrant-plugin-ganeti/config.rb
-- lib/vagrant-plugin-ganeti/version.rb
-- lib/vagrant-plugin-ganeti/action.rb
-- lib/vagrant-plugin-ganeti/errors.rb
-- lib/vagrant-plugin-ganeti/provider.rb
-- lib/vagrant-plugin-ganeti/plugin.rb
-- lib/vagrant-plugin-ganeti.rb
+- lib/vagrant-ganeti.rb
+- lib/vagrant-ganeti/util/timer.rb
+- lib/vagrant-ganeti/util/ganeti_client.rb
+- lib/vagrant-ganeti/action/message_already_created.rb
+- lib/vagrant-ganeti/action/message_will_not_destroy.rb
+- lib/vagrant-ganeti/action/connect_ganeti.rb
+- lib/vagrant-ganeti/action/unlink_server.rb
+- lib/vagrant-ganeti/action/remove_instance.rb
+- lib/vagrant-ganeti/action/is_created.rb
+- lib/vagrant-ganeti/action/warn_networks.rb
+- lib/vagrant-ganeti/action/read_state.rb
+- lib/vagrant-ganeti/action/timed_provision.rb
+- lib/vagrant-ganeti/action/run_instance.rb
+- lib/vagrant-ganeti/action/message_not_created.rb
+- lib/vagrant-ganeti/action/read_ssh_info.rb
+- lib/vagrant-ganeti/action/is_reachable.rb
+- lib/vagrant-ganeti/action/sync_folders.rb
+- lib/vagrant-ganeti/action/message_not_reachable.rb
+- lib/vagrant-ganeti/config.rb
+- lib/vagrant-ganeti/version.rb
+- lib/vagrant-ganeti/action.rb
+- lib/vagrant-ganeti/errors.rb
+- lib/vagrant-ganeti/provider.rb
+- lib/vagrant-ganeti/plugin.rb
 - Gemfile
 - LICENSE
 - LICENSE.txt
+- example_box/ganeti1.box
 - example_box/README.md
 - example_box/Vagrantfile
 - example_box/metadata.json
 - example_box/ganeti.box
 - Rakefile
 - locales/en.yml
-- vagrant-plugin-ganeti.gemspec
+- vagrant-ganeti.gemspec
 - .gitignore
 homepage: http://www.vagrantup.com
 licenses: []
@@ -154,7 +155,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 
-rubyforge_project: vagrant-plugin-ganeti
+rubyforge_project: vagrant-ganeti
 rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3