vagrant-softlayer 0.3.2 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e2bcf85c294e1277c3f0735037d725a097c80573
-  data.tar.gz: 55d0ede2bc1d93190be3d4a0b5b6cc3ab7a93907
+  metadata.gz: c0c1fe3a1cabd26c85e98ea939676567e1be1fe4
+  data.tar.gz: a5d2fdffa3043056351f95ef7bfd8d91f6406ade
 SHA512:
-  metadata.gz: b6c90c5309edcbe1ec5d29b22628a058c715a4b2557654b6df6f2ca7cb8e6b426de4a45aef6e501302bc8effa30a4a002ba696e59d66550ec958996ceb7341b2
-  data.tar.gz: cb6f940ee32c41fb277b460fae31e2d2ff40d5dcd6596baf6946a55a0057332c2266f0aba6f6cc61e25973aa50f049e62f54da12ed776f1a9088b5f114c84895
+  metadata.gz: 8d6ac6b78727aa2e6c7644ef41199bef30ae792e1daf2c03c6b2d85c3abd8f4781406d125b4e4a8fc6f1843d8e1ba56c66e8db57b3ee80f26ad99cc1bb9ae57e
+  data.tar.gz: be92961dc1d8fce6b402998b8c1112a74a6f634a322a29d3519f4e9be4ab739d9d71aa00fb4c6b16cede7811e29c6407578e300e403d70182a84d87f23ee1fa6

data/CHANGELOG.md

@@ -1,3 +1,15 @@
+## 0.3.3 (August 21, 2014)
+
+ENHANCEMENTS:
+
+  - Add parallel execution capability.
+  - Add configuration variables for provision and rebuild timeout.
+  - Use builtin synced folders if available.
+
+BUG FIXES:
+
+  - Raise a proper exception on timeout.
+
 ## 0.3.2 (August 1, 2014)
 
 ENHANCEMENTS:

data/README.md

@@ -105,6 +105,13 @@ Parameter          | Description
 
 \** When defining the instance you can either specify an `image_guid` or `operating_system` with optional `disk_capacity`.
 
+### Timeouts
+
+Parameter           | Description                               | Default         | Required
+------------------- | ------------------------------------------| ----------------| --------
+`provision_timeout` | Provisioning wait timeout in seconds      | 1200            | no
+`rebuild_timeout`   | Rebuild wait timeout in seconds           | 1200            | no
+
 These can be set like typical provider-specific configuration:
 
 ```
@@ -247,6 +254,3 @@ $ bundle exec vagrant up --provider=softlayer
 
 Emiliano Ticci (@emyl)
 Julio Lajara (@ju2wheels)
-
-[![Bitdeli Badge](https://d2weczhvl823v0.cloudfront.net/audiolize/vagrant-softlayer/trend.png)](https://bitdeli.com/free "Bitdeli Badge")
-

data/lib/vagrant-softlayer.rb

@@ -1,22 +1,22 @@
-require "pathname"
-require "softlayer_api"
-require "vagrant-softlayer/plugin"
-
-module VagrantPlugins
-  module SoftLayer
-    API_PRIVATE_ENDPOINT = ::SoftLayer::API_PRIVATE_ENDPOINT
-    API_PUBLIC_ENDPOINT  = ::SoftLayer::API_PUBLIC_ENDPOINT
-
-    lib_path = Pathname.new(File.expand_path("../vagrant-softlayer", __FILE__))
-    autoload :Action, lib_path.join("action")
-    autoload :Config, lib_path.join("config")
-    autoload :Errors, lib_path.join("errors")
-
-    # This returns the path to the source of this plugin.
-    #
-    # @return [Pathname]
-    def self.source_root
-      @source_root ||= Pathname.new(File.expand_path("../../", __FILE__))
-    end
-  end
-end
+require "pathname"
+require "softlayer_api"
+require "vagrant-softlayer/plugin"
+
+module VagrantPlugins
+  module SoftLayer
+    API_PRIVATE_ENDPOINT = ::SoftLayer::API_PRIVATE_ENDPOINT
+    API_PUBLIC_ENDPOINT  = ::SoftLayer::API_PUBLIC_ENDPOINT
+
+    lib_path = Pathname.new(File.expand_path("../vagrant-softlayer", __FILE__))
+    autoload :Action, lib_path.join("action")
+    autoload :Config, lib_path.join("config")
+    autoload :Errors, lib_path.join("errors")
+
+    # This returns the path to the source of this plugin.
+    #
+    # @return [Pathname]
+    def self.source_root
+      @source_root ||= Pathname.new(File.expand_path("../../", __FILE__))
+    end
+  end
+end

data/lib/vagrant-softlayer/action.rb

@@ -60,7 +60,7 @@ module VagrantPlugins
             end
 
             b2.use Provision
-            b2.use SyncFolders
+            defined?(SyncedFolders) ? b2.use(SyncedFolders) : b2.use(SyncFolders)
           end
         end
       end
@@ -100,7 +100,7 @@ module VagrantPlugins
                   b3.use SetupSoftLayer
                   b3.use RebuildInstance
                   b3.use Provision
-                  b3.use SyncFolders
+                  defined?(SyncedFolders) ? b3.use(SyncedFolders) : b3.use(SyncFolders)
                   b3.use WaitForRebuild
                   b3.use WaitForCommunicator
                 end
@@ -195,7 +195,7 @@ module VagrantPlugins
             if env1[:result]
               b1.use SetupSoftLayer
               b1.use Provision
-              b1.use SyncFolders
+              defined?(SyncedFolders) ? b1.use(SyncedFolders) : b1.use(SyncFolders)
               b1.use CreateInstance
               b1.use WaitForProvision
               b1.use UpdateDNS
@@ -206,7 +206,7 @@ module VagrantPlugins
                 if env2[:result]
                   b2.use SetupSoftLayer
                   b2.use Provision
-                  b2.use SyncFolders
+                  defined?(SyncedFolders) ? b2.use(SyncedFolders) : b2.use(SyncFolders)
                   b2.use StartInstance
                   b2.use UpdateDNS
                   b2.use JoinLoadBalancer

data/lib/vagrant-softlayer/action/destroy_instance.rb

@@ -1,23 +1,23 @@
-module VagrantPlugins
-  module SoftLayer
-    module Action
-      # This deletes the running instance.
-      class DestroyInstance
-        include Util::Warden
-
-        def initialize(app, env)
-          @app = app
-        end
-
-        def call(env)
-          env[:ui].info I18n.t("vagrant_softlayer.vm.destroying")
-          
-          sl_warden { env[:sl_machine].deleteObject }
-          env[:machine].id = nil
-
-          @app.call(env)
-        end
-      end
-    end
-  end
-end
+module VagrantPlugins
+  module SoftLayer
+    module Action
+      # This deletes the running instance.
+      class DestroyInstance
+        include Util::Warden
+
+        def initialize(app, env)
+          @app = app
+        end
+
+        def call(env)
+          env[:ui].info I18n.t("vagrant_softlayer.vm.destroying")
+          
+          sl_warden { env[:sl_machine].deleteObject }
+          env[:machine].id = nil
+
+          @app.call(env)
+        end
+      end
+    end
+  end
+end

data/lib/vagrant-softlayer/action/read_ssh_info.rb

@@ -1,28 +1,28 @@
-module VagrantPlugins
-  module SoftLayer
-    module Action
-      # This action reads the SSH info for the machine and puts it into the
-      # `:machine_ssh_info` key in the environment.
-      class ReadSSHInfo
-        include Util::Network
-        include Util::Warden
-
-        def initialize(app, env)
-          @app = app
-        end
-
-        def call(env)
-          env[:machine_ssh_info] = read_ssh_info(env)
-
-          @app.call(env)
-        end
-
-        def read_ssh_info(env)
-          return nil unless env[:sl_machine]
-
-          return { :host => ip_address(env), :port => 22 }
-        end
-      end
-    end
-  end
-end
+module VagrantPlugins
+  module SoftLayer
+    module Action
+      # This action reads the SSH info for the machine and puts it into the
+      # `:machine_ssh_info` key in the environment.
+      class ReadSSHInfo
+        include Util::Network
+        include Util::Warden
+
+        def initialize(app, env)
+          @app = app
+        end
+
+        def call(env)
+          env[:machine_ssh_info] = read_ssh_info(env)
+
+          @app.call(env)
+        end
+
+        def read_ssh_info(env)
+          return nil unless env[:sl_machine]
+
+          return { :host => ip_address(env), :port => 22 }
+        end
+      end
+    end
+  end
+end

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

@@ -1,42 +1,42 @@
-require "log4r"
-
-module VagrantPlugins
-  module SoftLayer
-    module Action
-      # This action reads the state of the machine and puts it in the
-      # `:machine_state_id` key in the environment.
-      class ReadState
-        include Util::Warden
-
-        def initialize(app, env)
-          @app    = app
-          @logger = Log4r::Logger.new("vagrant_softlayer::action::read_state")
-        end
-
-        def call(env)
-          env[:machine_state_id] = read_state(env)
-
-          # Carry on
-          @app.call(env)
-        end
-
-        def read_state(env)
-          return :not_created unless env[:sl_machine]
-
-          wipe_id = lambda do
-            @logger.info("Machine not found, assuming it got destroyed.")
-            env[:machine].id = nil
-            next :not_created
-          end
-
-          state = sl_warden(wipe_id) { env[:sl_machine].getPowerState }
-          if state && ["Halted", "Paused", "Running"].include?(state["name"])
-            return state["name"].downcase.to_sym
-          else
-            return :unknown
-          end
-        end
-      end
-    end
-  end
-end
+require "log4r"
+
+module VagrantPlugins
+  module SoftLayer
+    module Action
+      # This action reads the state of the machine and puts it in the
+      # `:machine_state_id` key in the environment.
+      class ReadState
+        include Util::Warden
+
+        def initialize(app, env)
+          @app    = app
+          @logger = Log4r::Logger.new("vagrant_softlayer::action::read_state")
+        end
+
+        def call(env)
+          env[:machine_state_id] = read_state(env)
+
+          # Carry on
+          @app.call(env)
+        end
+
+        def read_state(env)
+          return :not_created unless env[:sl_machine]
+
+          wipe_id = lambda do
+            @logger.info("Machine not found, assuming it got destroyed.")
+            env[:machine].id = nil
+            next :not_created
+          end
+
+          state = sl_warden(wipe_id) { env[:sl_machine].getPowerState }
+          if state && ["Halted", "Paused", "Running"].include?(state["name"])
+            return state["name"].downcase.to_sym
+          else
+            return :unknown
+          end
+        end
+      end
+    end
+  end
+end

data/lib/vagrant-softlayer/action/rebuild_instance.rb

@@ -1,35 +1,35 @@
-module VagrantPlugins
-  module SoftLayer
-    module Action
-      # This rebuilds the running instance.
-      class RebuildInstance
-        include Util::Network
-        include Util::Warden
-
-        def initialize(app, env)
-          @app    = app
-          @logger = Log4r::Logger.new("vagrant_softlayer::action::rebuild_instance")
-        end
-
-        def call(env)
-          env[:ui].info I18n.t("vagrant_softlayer.vm.rebuilding")
-
-          # Wipe out provision sentinel file, we need to run provisioning after rebuild
-          @logger.debug("Looking for provision sentinel file.")
-          provision_file = env[:machine].data_dir.join("action_provision")
-          if provision_file.file?
-            @logger.debug("Removing provision sentinel file.")
-            provision_file.delete
-          end
-
-          template = { "sshKeyIds" => ssh_keys(env, true) }
-          template["customProvisionScriptUri"] = env[:machine].provider_config.post_install if env[:machine].provider_config.post_install
-          
-          sl_warden { env[:sl_machine].reloadOperatingSystem("FORCE", template) }
-          
-          @app.call(env)
-        end
-      end
-    end
-  end
-end
+module VagrantPlugins
+  module SoftLayer
+    module Action
+      # This rebuilds the running instance.
+      class RebuildInstance
+        include Util::Network
+        include Util::Warden
+
+        def initialize(app, env)
+          @app    = app
+          @logger = Log4r::Logger.new("vagrant_softlayer::action::rebuild_instance")
+        end
+
+        def call(env)
+          env[:ui].info I18n.t("vagrant_softlayer.vm.rebuilding")
+
+          # Wipe out provision sentinel file, we need to run provisioning after rebuild
+          @logger.debug("Looking for provision sentinel file.")
+          provision_file = env[:machine].data_dir.join("action_provision")
+          if provision_file.file?
+            @logger.debug("Removing provision sentinel file.")
+            provision_file.delete
+          end
+
+          template = { "sshKeyIds" => ssh_keys(env, true) }
+          template["customProvisionScriptUri"] = env[:machine].provider_config.post_install if env[:machine].provider_config.post_install
+          
+          sl_warden { env[:sl_machine].reloadOperatingSystem("FORCE", template) }
+          
+          @app.call(env)
+        end
+      end
+    end
+  end
+end

data/lib/vagrant-softlayer/action/start_instance.rb

@@ -1,21 +1,21 @@
-module VagrantPlugins
-  module SoftLayer
-    module Action
-      # This starts a stopped instance.
-      class StartInstance
-        include Util::Warden
-
-        def initialize(app, env)
-          @app    = app
-        end
-
-        def call(env)
-          env[:ui].info I18n.t("vagrant_softlayer.vm.starting")
-          sl_warden { env[:sl_machine].powerOn }
-          
-          @app.call(env)
-        end
-      end
-    end
-  end
-end
+module VagrantPlugins
+  module SoftLayer
+    module Action
+      # This starts a stopped instance.
+      class StartInstance
+        include Util::Warden
+
+        def initialize(app, env)
+          @app    = app
+        end
+
+        def call(env)
+          env[:ui].info I18n.t("vagrant_softlayer.vm.starting")
+          sl_warden { env[:sl_machine].powerOn }
+          
+          @app.call(env)
+        end
+      end
+    end
+  end
+end

data/lib/vagrant-softlayer/action/stop_instance.rb

@@ -1,30 +1,30 @@
-module VagrantPlugins
-  module SoftLayer
-    module Action
-      # This stops the running instance.
-      class StopInstance
-        include Util::Warden
-
-        def initialize(app, env)
-          @app    = app
-        end
-
-        def call(env)
-          if env[:machine].state.id == :halted
-            env[:ui].info I18n.t("vagrant_softlayer.vm.already_stopped")
-          else
-            if env[:force_halt]
-              env[:ui].info I18n.t("vagrant_softlayer.vm.stopping_force")
-              sl_warden { env[:sl_machine].powerOff }
-            else
-              env[:ui].info I18n.t("vagrant_softlayer.vm.stopping")
-              sl_warden { env[:sl_machine].powerOffSoft }
-            end
-          end
-
-          @app.call(env)
-        end
-      end
-    end
-  end
-end
+module VagrantPlugins
+  module SoftLayer
+    module Action
+      # This stops the running instance.
+      class StopInstance
+        include Util::Warden
+
+        def initialize(app, env)
+          @app    = app
+        end
+
+        def call(env)
+          if env[:machine].state.id == :halted
+            env[:ui].info I18n.t("vagrant_softlayer.vm.already_stopped")
+          else
+            if env[:force_halt]
+              env[:ui].info I18n.t("vagrant_softlayer.vm.stopping_force")
+              sl_warden { env[:sl_machine].powerOff }
+            else
+              env[:ui].info I18n.t("vagrant_softlayer.vm.stopping")
+              sl_warden { env[:sl_machine].powerOffSoft }
+            end
+          end
+
+          @app.call(env)
+        end
+      end
+    end
+  end
+end

data/lib/vagrant-softlayer/action/wait_for_provision.rb

@@ -19,8 +19,8 @@ module VagrantPlugins
 
           retry_msg = lambda { @logger.debug("Object not found, retrying in 10 seconds.") }
 
-          # 20 minutes timeout
-          Timeout::timeout(1200) do
+          # Defaults to 20 minutes timeout
+          Timeout::timeout(env[:machine].provider_config.provision_timeout, Errors::SLProvisionTimeoutError) do
             @logger.debug("Checking if the newly ordered machine has been provisioned.")
             sl_warden(retry_msg, 10) do
               while env[:sl_machine].getPowerState["name"] != "Running" || env[:sl_machine].object_mask( { "provisionDate" => "" } ).getObject == {}
@@ -31,7 +31,7 @@ module VagrantPlugins
           end
 
           env[:ui].info I18n.t("vagrant_softlayer.vm.provisioned")
-          
+
           @app.call(env)
         end
       end

data/lib/vagrant-softlayer/action/wait_for_rebuild.rb

@@ -15,8 +15,8 @@ module VagrantPlugins
         def call(env)
           env[:ui].info I18n.t("vagrant_softlayer.vm.wait_for_rebuild")
 
-          # 20 minutes timeout
-          Timeout::timeout(1200) do
+          # Defaults to 20 minutes timeout
+          Timeout::timeout(env[:machine].provider_config.rebuild_timeout, Errors::SLRebuildTimeoutError) do
             @logger.debug("Checking if the instance has been rebuilt.")
             sl_warden do
               while env[:sl_machine].object_mask("activeTransactionCount").getObject["activeTransactionCount"] > 0
@@ -27,7 +27,7 @@ module VagrantPlugins
           end
 
           env[:ui].info I18n.t("vagrant_softlayer.vm.rebuilt")
-          
+
           @app.call(env)
         end
       end

data/lib/vagrant-softlayer/config.rb

@@ -54,6 +54,12 @@ module VagrantPlugins
       # Whether or not the instance only has access to the private network.
       attr_accessor :private_only
 
+      # The amount of time in seconds to wait for provision to complete.
+      attr_accessor :provision_timeout
+
+      # The amount of time in seconds to wait for rebuild to complete.
+      attr_accessor :rebuild_timeout
+
       # The id or name of the ssh key to be provisioned.
       attr_accessor :ssh_key
 
@@ -80,25 +86,27 @@ module VagrantPlugins
         @endpoint_url = UNSET_VALUE
         @username     = UNSET_VALUE
 
-        @datacenter       = UNSET_VALUE
-        @dedicated        = UNSET_VALUE
-        @disk_capacity    = UNSET_VALUE
-        @domain           = UNSET_VALUE
-        @force_private_ip = UNSET_VALUE
-        @hostname         = UNSET_VALUE
-        @image_guid       = UNSET_VALUE
-        @hourly_billing   = UNSET_VALUE
-        @local_disk       = UNSET_VALUE
-        @max_memory       = UNSET_VALUE
-        @network_speed    = UNSET_VALUE
-        @operating_system = UNSET_VALUE
-        @post_install     = UNSET_VALUE
-        @private_only     = UNSET_VALUE
-        @ssh_key          = UNSET_VALUE
-        @start_cpus       = UNSET_VALUE
-        @user_data        = UNSET_VALUE
-        @vlan_private     = UNSET_VALUE
-        @vlan_public      = UNSET_VALUE
+        @datacenter        = UNSET_VALUE
+        @dedicated         = UNSET_VALUE
+        @disk_capacity     = UNSET_VALUE
+        @domain            = UNSET_VALUE
+        @force_private_ip  = UNSET_VALUE
+        @hostname          = UNSET_VALUE
+        @image_guid        = UNSET_VALUE
+        @hourly_billing    = UNSET_VALUE
+        @local_disk        = UNSET_VALUE
+        @max_memory        = UNSET_VALUE
+        @network_speed     = UNSET_VALUE
+        @operating_system  = UNSET_VALUE
+        @post_install      = UNSET_VALUE
+        @private_only      = UNSET_VALUE
+        @provision_timeout = UNSET_VALUE
+        @rebuild_timeout   = UNSET_VALUE
+        @ssh_key           = UNSET_VALUE
+        @start_cpus        = UNSET_VALUE
+        @user_data         = UNSET_VALUE
+        @vlan_private      = UNSET_VALUE
+        @vlan_public       = UNSET_VALUE
 
         @load_balancers = []
         @manage_dns     = UNSET_VALUE
@@ -189,6 +197,12 @@ module VagrantPlugins
         # Private-network only is false by default.
         @private_only = false if @private_only == UNSET_VALUE
 
+        # The amount of time in seconds to wait for provision to complete.
+        @provision_timeout = 1200 if @provision_timeout == UNSET_VALUE
+
+        # The amount of time in seconds to wait for rebuild to complete.
+        @rebuild_timeout = 1200 if @rebuild_timeout == UNSET_VALUE
+
         # SSH key should be specified in Vagrantfile, so we set default to nil.
         @ssh_key = nil if @ssh_key == UNSET_VALUE
 

data/lib/vagrant-softlayer/errors.rb

@@ -21,6 +21,14 @@ module VagrantPlugins
         error_key(:load_balancer_not_found)
       end
 
+      class SLProvisionTimeoutError < VagrantSoftLayerError
+        error_key(:provision_timeout_error)
+      end
+
+      class SLRebuildTimeoutError < VagrantSoftLayerError
+        error_key(:rebuild_timeout_error)
+      end
+
       class SLSshKeyNotFound < VagrantSoftLayerError
         error_key(:ssh_key_not_found)
       end

data/lib/vagrant-softlayer/plugin.rb

@@ -29,7 +29,7 @@ module VagrantPlugins
         Config
       end
 
-      provider(:softlayer) do
+      provider(:softlayer, :parallel => true) do
         init_logging
         init_i18n
 

data/lib/vagrant-softlayer/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module SoftLayer
-    VERSION = "0.3.2"
+    VERSION = "0.3.3"
   end
 end

data/locales/en.yml

@@ -120,6 +120,30 @@ en:
         The load balancer you're trying to join has not been found.
 
         Please check the configuration parameter for virtual IP address.
+      provision_timeout_error: |-
+        Timed out while waiting for the instance to be available. This
+        means that Vagrant was unable to communicate with the instance
+        within the configured time period.
+
+        Please check the instance status using another SoftLayer
+        client tool (e.g. `sl` command line utility). If the box appears
+        to be properly up, you may want to increase the provision timeout:
+
+        config.vm.provider :softlayer do |sl|
+          sl.provision_timeout = 99999 # in seconds
+        end
+      rebuild_timeout_error: |-
+        Timed out while waiting for the instance to be available. This
+        means that Vagrant was unable to communicate with the instance
+        within the configured time period.
+
+        Please check the instance status using another SoftLayer
+        client tool (e.g. `sl` command line utility). If the box appears
+        to be properly up, you may want to increase the rebuild timeout:
+
+        config.vm.provider :softlayer do |sl|
+          sl.rebuild_timeout = 99999 # in seconds
+        end
       ssh_key_not_found: |-
         The SSH key you're trying to set (%{key}) does not exists in the
         SoftLayer account's keychain.

data/spec/vagrant-softlayer/config_spec.rb

@@ -15,25 +15,27 @@ describe VagrantPlugins::SoftLayer::Config do
     its("endpoint_url") { should eq VagrantPlugins::SoftLayer::API_PUBLIC_ENDPOINT }
     its("username")     { should be_nil }
 
-    its("datacenter")       { should be_nil }
-    its("dedicated")        { should be_false }
-    its("disk_capacity")    { should be_nil }
-    its("domain")           { should be_nil }
-    its("force_private_ip") { should be_false }
-    its("hostname")         { should be_nil }
-    its("hourly_billing")   { should be_true }
-    its("image_guid")       { should be_nil }
-    its("local_disk")       { should be_true }
-    its("max_memory")       { should eq 1024 }
-    its("network_speed")    { should eq 10 }
-    its("operating_system") { should eq "UBUNTU_LATEST" }
-    its("post_install")     { should be_nil }
-    its("private_only")     { should be_false }
-    its("ssh_key")          { should be_nil }
-    its("start_cpus")       { should eq 1 }
-    its("user_data")        { should be_nil }
-    its("vlan_private")     { should be_nil }
-    its("vlan_public")      { should be_nil }
+    its("datacenter")        { should be_nil }
+    its("dedicated")         { should be_false }
+    its("disk_capacity")     { should be_nil }
+    its("domain")            { should be_nil }
+    its("force_private_ip")  { should be_false }
+    its("hostname")          { should be_nil }
+    its("hourly_billing")    { should be_true }
+    its("image_guid")        { should be_nil }
+    its("local_disk")        { should be_true }
+    its("max_memory")        { should eq 1024 }
+    its("network_speed")     { should eq 10 }
+    its("operating_system")  { should eq "UBUNTU_LATEST" }
+    its("post_install")      { should be_nil }
+    its("private_only")      { should be_false }
+    its("provision_timeout") { should eq 1200 }
+    its("rebuild_timeout")   { should eq 1200 }
+    its("ssh_key")           { should be_nil }
+    its("start_cpus")        { should eq 1 }
+    its("user_data")         { should be_nil }
+    its("vlan_private")      { should be_nil }
+    its("vlan_public")       { should be_nil }
 
     its("load_balancers") { should eq [] }
     its("manage_dns")     { should be_false }
@@ -53,7 +55,7 @@ describe VagrantPlugins::SoftLayer::Config do
     end
 
     context "integers" do
-      [:max_memory, :network_speed, :ssh_key, :start_cpus, :vlan_private, :vlan_public].each do |attribute|
+      [:max_memory, :network_speed, :provision_timeout, :rebuild_timeout, :ssh_key, :start_cpus, :vlan_private, :vlan_public].each do |attribute|
         it "should not default #{attribute} if overridden" do
           config.send("#{attribute}=".to_sym, 999)
           config.finalize!
@@ -131,26 +133,28 @@ describe VagrantPlugins::SoftLayer::Config do
       config.api_key  = "An API key"
       config.username = "An username"
 
-      config.datacenter       = "ams01"
-      config.dedicated        = false
-      config.domain           = "example.com"
-      config.disk_capacity    = { 0 => 25 }
-      config.force_private_ip = false
-      config.hostname         = "vagrant"
-      config.hourly_billing   = true
-      config.image_guid       = nil
-      config.local_disk       = true
-      config.max_memory       = 1024
-      config.network_speed    = 10
-      config.operating_system = "UBUNTU_LATEST"
-      config.post_install     = "http://example.com/foo"
-      config.ssh_key          = ["First key", "Second key"]
-      config.start_cpus       = 1
-      config.user_data        = "some metadata"
-      config.vlan_private     = 111
-      config.vlan_public      = 222
-
-      config.manage_dns       = false
+      config.datacenter        = "ams01"
+      config.dedicated         = false
+      config.domain            = "example.com"
+      config.disk_capacity     = { 0 => 25 }
+      config.force_private_ip  = false
+      config.hostname          = "vagrant"
+      config.hourly_billing    = true
+      config.image_guid        = nil
+      config.local_disk        = true
+      config.max_memory        = 1024
+      config.network_speed     = 10
+      config.operating_system  = "UBUNTU_LATEST"
+      config.post_install      = "http://example.com/foo"
+      config.provision_timeout = 1200
+      config.rebuild_timeout   = 1200
+      config.ssh_key           = ["First key", "Second key"]
+      config.start_cpus        = 1
+      config.user_data         = "some metadata"
+      config.vlan_private      = 111
+      config.vlan_public       = 222
+
+      config.manage_dns        = false
 
       machine.stub_chain(:config, :vm, :hostname).and_return(nil)
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-softlayer
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors:
 - Audiolize GmbH
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-01 00:00:00.000000000 Z
+date: 2014-08-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: softlayer_api