vagrant-smartos 0.0.1alpha → 0.0.2pre1

data/.gitignore

@@ -15,3 +15,4 @@ spec/reports
 test/tmp
 test/version_tmp
 tmp
+.vagrant

data/README.md

@@ -1,29 +1,99 @@
-# Vagrant::Smartos
+# Vagrant SmartOS Provider
 
-TODO: Write a gem description
+Provision SmartOS zones using vagrant. For now, it only works with OS container zones.
+
+## Notes
+
+This has only been demonstrated to work against a SmartOS hypervisor running in a VMware Fusion image, but since it's only interacted with via SSH, there is no reason why this won't work against a physical SmartOS hypervisor.
+
+This is purely a prototype / proof-of-concept hacked together. I make no apologies for the state of the code or the lack of tests. Feel free to fix and pull-request :-p
+
+Also, right now it uses a dummy box to get vagrant to play ball, whilst requiring an `image_uuid` parameter in the Vagrantfile. It might be much tidier if we could package up SmartOS images into vagrant-boxes and use those.
 
 ## Installation
 
-Add this line to your application's Gemfile:
+* Get Vagrant 1.2.0+ installed (see elsewhere - I've been building using version 1.2.2).
+
+* Install the gem from RubyGems:
+
+  `vagrant plugin install --plugin-prerelease --plugin-source https://rubygems.org/ vagrant-smartos`
+
+* Add the dummy box:
+
+  `vagrant box add smartos-dummy https://github.com/joshado/vagrant-smartos/raw/master/example_box/smartos.box`
+
+* Boot a SmartOS hypervisor somewhere. It shouldn't matter if this is VMWare Fusion, VirtualBox or a dedicated machine, as long as you have SSH access to it.
+
+* Ensure your local ssh key is in the roots `authorized_keys` file on the SmartOS box. The simple way to test this is to `ssh root@<hypervisor ip>` from your workstation, which should drop you straight into a root shell on the hypervisor.
+
+* Write your `Vagrantfile`. See below for an example one and the options you can provide.
+
+* Run your VMs:
+
+  `vagrant up --provider=smartos`
+
+
+## Example Vagrantfile and options
+
+There are two specific parameters required for the SmartOS provider (`hypervisor` and `image_uuid`) and a bunch of optional ones, you should be able to work it out:
+
+   Vagrant.require_plugin "vagrant-smartos"
+
+    Vagrant.configure("2") do |config|
+
+      # For the time being, use our dummy box
+      config.vm.box = "smartos-dummy"
+
+      config.vm.provider :smartos do |smartos, override|
+        # Required: This is which hypervisor to provision the VM on.
+        # The format must be "<username>@<ip or hostname>"
+        smartos.hypervisor = "root@172.16.251.129"
+
+        # Required: This is the UUID of the SmartOS image to use for the VMs. 
+        # It must already be imported before running vagrant.
+        smartos.image_uuid = "cf7e2f40-9276-11e2-af9a-0bad2233fb0b"  # this is base64:1.9.1
+
+        # Optional: The RAM allocation for the machine, defaults to the SmartOS default (256MB)
+        # smartos.ram = 512
 
-    gem 'vagrant-smartos'
+        # Optional: Disk quota for the machine, defaults to the SmartOS default (5G)
+        # smartos.quota = 10
 
-And then execute:
+        # Optional: Specify the nic_tag to use
+        # If omitted, 'admin' will be the default
+        # smartos.nic_tag = "admin"
 
-    $ bundle
+        # Optional: Specify a static IP address for the VM
+        # If omitted, 'dhcp' will be used
+        # smartos.ip_address = "1.2.3.4"
 
-Or install it yourself as:
+        # Optional: Specify the net-mask (required if not using dhcp)
+        # smartos.subnet_mask = "255.255.255.0"
 
-    $ gem install vagrant-smartos
+        # Optional: Specify the gateway (required if not using dhcp)
+        # smartos.gateway = "255.255.255.0"
 
-## Usage
+        # Optional: Specify a VLAN tag for this VM
+        # smartos.vlan = 1234
+      end
 
-TODO: Write usage instructions here
+      # RSync'ed shared folders should work as normal
+      config.vm.synced_folder "./", "/work-dir"
 
-## Contributing
+      # Multi-VMs should be fine, too; they will take the default parameters from above, and you can override
+      # specifics for each VM
+      #
+      # config.vm.define :box1 do |box|
+      #    box.vm.provider :smartos do |smartos, override|
+      #      smartos.ip_address = "172.16.251.21"
+      #    end
+      # end
+      #
+      # config.vm.define :box2 do |box|
+      #    box.vm.provider :smartos do |smartos, override|
+      #      smartos.ip_address = "172.16.251.21"
+      #    end
+      # end
+      #
 
-1. Fork it
-2. Create your feature branch (`git checkout -b my-new-feature`)
-3. Commit your changes (`git commit -am 'Add some feature'`)
-4. Push to the branch (`git push origin my-new-feature`)
-5. Create new Pull Request
+    end

data/Vagrantfile

@@ -3,44 +3,26 @@ Vagrant.require_plugin "vagrant-smartos"
 Vagrant.configure("2") do |config|
   config.vm.box = "smartos-dummy"
 
-
-  config.vm.provision :shell, :inline => "pkgin -y install ruby193-base"
-
   config.vm.provider :smartos do |smartos, override|
 
     smartos.hypervisor = "root@172.16.251.129"
-    smartos.image_uuid = "cf7e2f40-9276-11e2-af9a-0bad2233fb0b"
-
-    smartos.ip_address = "172.16.251.18"
-    smartos.subnet_mask = "255.255.255.0"
-    smartos.gateway = "172.16.251.2"
+    smartos.image_uuid = "13ba5a87-caa8-4092-a488-65589afb7799"
+    smartos.ram = 512
+    
+    # smartos.ip_address = "172.16.251.18"
+    # smartos.subnet_mask = "255.255.255.0"
+    # smartos.gateway = "172.16.251.2"
   end
 
   config.vm.synced_folder "locales/", "/vagrant"
 
 
   config.vm.define :test1 do |test|
-    test.vm.provider :smartos do |smartos, override|
-      smartos.ip_address = "172.16.251.21"
-    end
+#    test.vm.provider :smartos do |smartos, override|
+#      smartos.ip_address = "172.16.251.21"
+#    end
   end
 
-  config.vm.define :test2 do |test|
-    test.vm.provider :smartos do |smartos, override|
-      smartos.ip_address = "172.16.251.22"
-    end
-  end
 
-  config.vm.define :test3 do |test|
-    test.vm.provider :smartos do |smartos, override|
-      smartos.ip_address = "172.16.251.23"
-    end
-  end
-
-  config.vm.define :test4 do |test|
-    test.vm.provider :smartos do |smartos, override|
-      smartos.ip_address = "172.16.251.24"
-    end
-  end
 
 end

data/lib/vagrant-smartos.rb

@@ -2,12 +2,12 @@ require 'pathname'
 
 require "vagrant-smartos/version"
 require 'vagrant-smartos/plugin'
+require 'vagrant-smartos/errors'
 
 module VagrantPlugins
   module Smartos
     lib_path = Pathname.new(File.expand_path("../vagrant-smartos", __FILE__))
-    #autoload :Action, lib_path.join("action")
-    #autoload :Errors, lib_path.join("errors")
+
 
     # This returns the path to the source of this plugin.
     #

data/lib/vagrant-smartos/action/connect_hypervisor.rb

@@ -6,6 +6,31 @@ module VagrantPlugins
     class Provider
 
 
+      class SshOutput
+        attr_accessor :exit_code
+        attr_reader :command
+
+        def initialize(command)
+          @command = command
+          @stderr = []
+          @stdout = []
+        end
+        
+        def append_stderr(data)
+          @stderr << data
+        end
+        def append_stdout(data)
+          @stdout << data
+        end
+
+        def stdout
+          @stdout.join("").chomp
+        end
+        def stderr
+          @stderr.join("").chomp
+        end
+      end
+
       class SshWrapper
         def initialize(net_ssh)
           @ssh = net_ssh
@@ -16,35 +41,35 @@ module VagrantPlugins
 
         # Public: Execute and block on a command on the remote SSH server
         #
-        # Returns the stdout data, stderr is piped out to screen
+        # Returns an SshOutput instance
         #
         # Raises SshWrapper::UnexpectedExitCode if the exitcode is non-0
         # Raises SshWrapper::CommandExecutionFailed if the command failed to execute
         def exec(command)
-          stdout_data = []
-          channel = @ssh.open_channel do |ch|
-            ch.exec command do |ch, success|
-              raise SshWrapper::CommandExecutionFailed unless success
-
-              # "on_data" is called when the process writes something to stdout
-              ch.on_data do |c, data|
-                stdout_data << data
-              end
+          SshOutput.new(command).tap do |output|
 
-              # "on_extended_data" is called when the process writes something to stderr
-              ch.on_extended_data do |c, type, data|
-                $stderr.print data
-              end
+            channel = @ssh.open_channel do |ch|
+              ch.exec command do |ch, success|
+                raise SshWrapper::CommandExecutionFailed unless success
+
+                # "on_data" is called when the process writes something to stdout
+                ch.on_data do |c, data|
+                  output.append_stdout(data)
+                end
 
-              channel.on_request("exit-status") do |ch,data|
-                raise SshWrapper::UnexpectedExitCode unless data.read_long == 0
+                # "on_extended_data" is called when the process writes something to stderr
+                ch.on_extended_data do |c, type, data|
+                  output.append_stderr(data)
+                end
+
+                channel.on_request("exit-status") do |ch,data|
+                  output.exit_code = data.read_long
+                end
               end
             end
-          end
 
-          channel.wait
-
-          stdout_data.join("")
+            channel.wait            
+          end
         end
       end
 

data/lib/vagrant-smartos/action/read_state.rb

@@ -12,32 +12,70 @@ module VagrantPlugins
         end
 
         def call(env)         
-          output = env[:machine].id && read_state(env[:hyp], env[:machine])
-
-          if output
-            env[:machine_state_id] = output["state"].to_sym
-            env[:machine_ssh_info] = {
-              :host => output["nics"].first["ip"],
-              :port => 22
-            }
-          else
+          # Try reading the VM's "external" state
+          vminfo = env[:machine].id && read_state(env[:hyp], env[:machine])
+
+          # If it's got a DHCP, we'll need to wait until it's running, then read out 
+          if !vminfo || vminfo['state'] != "running"
+            # Don't do anything until we're actually running...
             env[:machine_state_id] = :not_created
+          else
+            
+            # Mark the state of the VM
+            env[:machine_state_id] = vminfo["state"].to_sym
+
+            # If the nic is DHCP, then we'll need to grab the internal state :-\
+            if vminfo["nics"].first["ip"] == "dhcp"
+              vm_sysinfo = read_internal_state(env[:hyp], env[:machine])
+              net0_ip = vm_sysinfo["Virtual Network Interfaces"]["net0"]["ip4addr"] rescue nil # I'm so lazy...
+
+              if vm_sysinfo && net0_ip
+                env[:machine_ssh_info] = {
+                  :host => net0_ip,
+                  :port => 22
+                }                
+              end
+
+            else
+              env[:machine_ssh_info] = {
+                :host => vminfo["nics"].first["ip"],
+                :port => 22
+              }
+            end
           end
 
           @app.call(env)
         end
 
-        def read_state(hyp, machine)
-          begin
-            output = hyp.exec("vmadm get #{machine.id}")
-          rescue SshWrapper::UnexpectedExitCode
-            return :not_created
+        # Internal: Reads the zone's internal state using a zlogin <uuid> sysinfo call
+        #
+        # hyp - the hypervisor object
+        # machine - the machine object
+        #
+        # Returns a hash of the sysinfo data: {"Live Image"=>"20130207T202554Z", "System Type"=>"SunOS", "Boot Time"=>"1371045058", "ZFS Quota"=>"5G", "UUID"=>"22fc9a70-b596-0130-6aac-109add5d41b9", "Hostname"=>"22fc9a70-b596-0130-6aac-109add5d41b9", "Setup"=>"false", "CPU Total Cores"=>1, "MiB of Memory"=>"512", "Virtual Network Interfaces"=>{"net0"=>{"MAC Address"=>"92:ed:e4:cd:c2:de", "ip4addr"=>"172.16.251.147", "Link Status"=>"up", "VLAN"=>"0"}}}
+        def read_internal_state(hyp, machine)
+          output = hyp.exec("zlogin #{machine.id} sysinfo")
+          if output.exit_code != 0
+            nil
+          else
+            JSON.load(output.stdout)
           end
+        end
+
+
+        # Internal: Reads the current state of the machine from the hypervisor
+        #
+        #  hyp     - the hypervisor connection object
+        #  machine - the Vagrant machine object
+        #
+        # Returns a hash of data returned by vmadm, or nil if the VM isn't found
+        def read_state(hyp, machine)
+          output = hyp.exec("vmadm get #{machine.id}")
 
-          if output.chomp == ""
+          if output.exit_code != 0 || output.stderr.chomp =~ /No such zone configured/ || output.stdout == ""
             nil
           else
-            JSON.load(output)
+            JSON.load(output.stdout)
           end
         end
       end

data/lib/vagrant-smartos/action/reload_instance.rb

@@ -0,0 +1,29 @@
+require 'uuid'
+require "log4r"
+require 'vagrant/util/retryable'
+
+module VagrantPlugins
+  module Smartos
+    class Provider
+      # This runs the configured instance.
+      class ReloadInstance
+        include Vagrant::Util::Retryable
+
+        def initialize(app, env)
+          @app    = app
+          @logger = Log4r::Logger.new("vagrant_smartos::action::reload_instance")
+        end
+
+        def call(env)
+          vm_uuid = env[:machine].id
+
+          if env[:machine].state.id != :not_created
+            env[:ui].info(I18n.t("vagrant_smartos.reloading"))
+            output = env[:hyp].exec("vmadm reboot #{vm_uuid}")
+            env[:machine].id = nil
+          end
+        end
+      end
+    end
+  end
+end

data/lib/vagrant-smartos/action/run_instance.rb

@@ -16,22 +16,19 @@ module VagrantPlugins
 
         def call(env)
 
-          image_uuid = 
-
-          vlan = "" #104
-          nic_tag = "admin"
-          ip_address = "172.16.251.120"
-          subnet_mask = "255.255.255.0"
-          gateway = "172.16.251.2"
-
           nic = {
             "nic_tag" => env[:machine].provider_config.nic_tag,
             "ip" => env[:machine].provider_config.ip_address,
-            "netmask" => env[:machine].provider_config.subnet_mask,
+            "netmask" =>env[:machine].provider_config.subnet_mask,
             "gateway" => env[:machine].provider_config.gateway,
             "primary" => true
           }
 
+          # Make sure we don't pass empty-string gateway / netmask to vmadm, as it isn't happy with this
+          nic.delete("netmask") if nic['netmask'].nil? || nic['netmask'].length == 0
+          nic.delete("gateway") if nic['gateway'].nil? || nic['gateway'].length == 0
+
+
           if env[:machine].provider_config.vlan
             nic["vlan_id"] = env[:machine].provider_config.vlan
           end
@@ -51,11 +48,13 @@ module VagrantPlugins
             }
           }
 
-
           # Launch!
           env[:ui].info(I18n.t("vagrant_smartos.launching_instance"))
 
-          env[:hyp].exec("vmadm create <<JSON\n#{JSON.dump(machine_json)}\nJSON")
+          output = env[:hyp].exec("vmadm create <<JSON\n#{JSON.dump(machine_json)}\nJSON")
+          if output.exit_code != 0 || output.stderr.chomp != "Successfully created #{env[:machine].id}"
+            raise Errors::VmadmError, :message => I18n.t("vagrant_smartos.errors.vmadm_create", :output => output.stderr.chomp)
+          end
 
           env[:ui].info(I18n.t("vagrant_smartos.waiting_for_ready"))
           while true

data/lib/vagrant-smartos/action/sync_folders.rb

@@ -8,7 +8,7 @@ module VagrantPlugins
   module Smartos
     class Provider
       # This middleware uses `rsync` to sync the folders over to the
-      # AWS instance.
+      # zone.
       class SyncFolders
         include Vagrant::Util::ScopedHashOverride
 
@@ -35,9 +35,7 @@ module VagrantPlugins
             # avoid creating an additional directory with rsync
             hostpath = "#{hostpath}/" if hostpath !~ /\/$/
 
-            env[:ui].info(I18n.t("vagrant_smartos.rsync_folder",
-                                :hostpath => hostpath,
-                                :guestpath => guestpath))
+            env[:ui].info(I18n.t("vagrant_smartos.rsync_folder", :hostpath => hostpath, :guestpath => guestpath))
 
             # Create the guest path
             env[:machine].communicate.sudo("mkdir -p '#{guestpath}'")
@@ -54,10 +52,7 @@ module VagrantPlugins
 
             r = Vagrant::Util::Subprocess.execute(*command)
             if r.exit_code != 0
-              raise Errors::RsyncError,
-                :guestpath => guestpath,
-                :hostpath => hostpath,
-                :stderr => r.stderr
+              raise Errors::RsyncError, :guestpath => guestpath, :hostpath => hostpath, :stderr => r.stderr
             end
           end
         end

data/lib/vagrant-smartos/action/terminate_instance.rb

@@ -19,7 +19,7 @@ module VagrantPlugins
 
           if env[:machine].state.id != :not_created
             env[:ui].info(I18n.t("vagrant_smartos.terminating"))
-            env[:hyp].exec("vmadm destroy #{vm_uuid}")
+            output = env[:hyp].exec("vmadm destroy #{vm_uuid}")
             env[:machine].id = nil
           end
         end

data/lib/vagrant-smartos/config.rb

@@ -30,7 +30,7 @@ module VagrantPlugins
         @hypervisor = nil if @hypervisor == UNSET_VALUE
         @image_uuid = nil if @image_uuid == UNSET_VALUE
         @nic_tag = "admin" if @nic_tag == UNSET_VALUE
-        @ip_address = nil if @ip_address == UNSET_VALUE
+        @ip_address = "dhcp" if @ip_address == UNSET_VALUE
         @subnet_mask = nil if @subnet_mask == UNSET_VALUE
         @gateway = nil if @gateway == UNSET_VALUE
         @vlan = nil if @vlan == UNSET_VALUE
@@ -46,9 +46,10 @@ module VagrantPlugins
 
         errors << I18n.t("vagrant_smartos.config.hypervisor_required") if @hypervisor.nil?
         errors << I18n.t("vagrant_smartos.config.image_uuid_required") if @image_uuid.nil?
-        errors << I18n.t("vagrant_smartos.config.ip_address_required") if @ip_address.nil?
-        errors << I18n.t("vagrant_smartos.config.subnet_mask_required") if @subnet_mask.nil?
-        errors << I18n.t("vagrant_smartos.config.gateway_required") if @gateway.nil?
+        unless @ip_address == "dhcp"
+          errors << I18n.t("vagrant_smartos.config.static_netmask_requied") if @subnet_mask.nil?
+          errors << I18n.t("vagrant_smartos.config.static_gateway_required") if @gateway.nil?
+        end
 
         { "SmartOS Provider" => errors }
       end

data/lib/vagrant-smartos/errors.rb

@@ -0,0 +1,16 @@
+require "vagrant"
+
+module VagrantPlugins
+  module Smartos
+    module Errors
+      class VagrantSmartosError < Vagrant::Errors::VagrantError
+        error_namespace("vagrant_smartos.errors")
+      end
+
+      class VmadmError < VagrantSmartosError
+        error_key(:vmadm)
+      end
+
+    end
+  end
+end

data/lib/vagrant-smartos/plugin.rb

@@ -1,4 +1,3 @@
-puts "I GOT LOADED"
 begin
   require "vagrant"
 rescue LoadError

data/lib/vagrant-smartos/provider.rb

@@ -16,6 +16,7 @@ module VagrantPlugins
       autoload :ReadState,              action_root.join("read_state")
       autoload :RunInstance,            action_root.join("run_instance")
       autoload :SyncFolders,            action_root.join("sync_folders")
+      autoload :ReloadInstance,         action_root.join("reload_instance")
       autoload :TerminateInstance,      action_root.join("terminate_instance")
 
       def initialize(machine)
@@ -47,6 +48,14 @@ module VagrantPlugins
 
       end
 
+      def action_reload
+        Vagrant::Action::Builder.new.tap do |b|
+          b.use ConfigValidate
+          b.use ConnectHypervisor
+          b.use ReloadInstance
+        end
+      end
+
       def action_provision
         Vagrant::Action::Builder.new.tap do |b|
           b.use ConfigValidate
@@ -121,6 +130,8 @@ module VagrantPlugins
           action_ssh_run
         when :provision
           action_provision
+        when :reload
+          action_reload
         end
       end
 

data/lib/vagrant-smartos/version.rb

@@ -1,5 +1,5 @@
 module Vagrant
   module Smartos
-    VERSION = "0.0.1alpha"
+    VERSION = "0.0.2pre1"
   end
 end

data/locales/en.yml

@@ -1,5 +1,13 @@
 en:
   vagrant_smartos:
+
+    errors:
+      vmadm: |-
+        Error when running vmadm on the hypervisor: %{message}
+
+      vmadm_create: |-
+        `vmadm create` returned: '%{output}'
+
     config:
       hypervisor_required: |-
         A hypervisor must be specified
@@ -7,32 +15,42 @@ en:
       image_uuid_required: |-
         An image_uuid value is required
 
+      static_gateway_required: |-
+        A gateway value is required if a static IP address is used
+
+      static_netmask_required: |-
+        A network mask value is required if a static IP address is used
+
     states:
-      running_short: |-
-        Running
-      running_long: |-
+      short_running: |-
         Running
+      long_running: |-
+        running
+      short_not_created: |-
+        not created
+      long_not_created: |-
+        The zone has not been created
 
     not_created: |-
-      Not CREATED!
+      Zone hasn't been created yet
 
     already_created: |-
-      ALREADY CREATED!
+      Zone already created
 
     launching_instance: |-
-      Yo, launching an instance, innit.
+      Launching SmartOS zone
 
     waiting_for_ready: |-
-      Yar, this is taking time. Hang on...
+      Waiting for zone to be ready
 
     waiting_for_ssh: |-
-      FFS. Should be done now. Still farting around with SSH.
+      Waiting for SSH
 
     ready: |-
-      Finally, the bastard is ready.
+      Zone is ready
 
     rsync_folder: |-
-      Fucker is out of date. Updating.
+      Updating the rsync shared folder
 
     terminating: |- 
-      Yeah, I didn't really like it either.
+      Shutting down the zone

data/vagrant-smartos.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |gem|
   gem.email         = ["thomas@haggett.org"]
   gem.description   = %q{SmartOS Hypervisor provider for Vagrant}
   gem.summary       = %q{SmartOS Hypervisor provider for Vagrant}
-  gem.homepage      = ""
+  gem.homepage      = "http://github.com/joshado/vagrant-smartos/"
 
   gem.files         = `git ls-files`.split($/)
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }

metadata

@@ -1,47 +1,41 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: vagrant-smartos
-version: !ruby/object:Gem::Version 
-  prerelease: true
-  segments: 
-  - 0
-  - 0
-  - 1alpha
-  version: 0.0.1alpha
+version: !ruby/object:Gem::Version
+  version: 0.0.2pre1
+  prerelease: 5
 platform: ruby
-authors: 
+authors:
 - Thomas Haggett
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2013-06-06 00:00:00 +01:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2013-06-12 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: uuid
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id001
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: SmartOS Hypervisor provider for Vagrant
-email: 
+email:
 - thomas@haggett.org
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - Gemfile
-- LICENSE.txt
 - README.md
 - Rakefile
 - Vagrantfile
@@ -54,46 +48,39 @@ files:
 - lib/vagrant-smartos/action/message_already_created.rb
 - lib/vagrant-smartos/action/message_not_created.rb
 - lib/vagrant-smartos/action/read_state.rb
+- lib/vagrant-smartos/action/reload_instance.rb
 - lib/vagrant-smartos/action/run_instance.rb
 - lib/vagrant-smartos/action/sync_folders.rb
 - lib/vagrant-smartos/action/terminate_instance.rb
 - lib/vagrant-smartos/config.rb
+- lib/vagrant-smartos/errors.rb
 - lib/vagrant-smartos/plugin.rb
 - lib/vagrant-smartos/provider.rb
 - lib/vagrant-smartos/version.rb
 - locales/en.yml
 - vagrant-smartos.gemspec
-has_rdoc: true
-homepage: ""
+homepage: http://github.com/joshado/vagrant-smartos/
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">"
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 1
-      - 3
-      - 1
+required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
+  requirements:
+  - - ! '>'
+    - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: SmartOS Hypervisor provider for Vagrant
 test_files: []
-

data/LICENSE.txt

@@ -1,22 +0,0 @@
-Copyright (c) 2013 Thomas Haggett
-
-MIT License
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.