Merge pull request #22 from lindycoder/time_and_report_config

Add configurable build timeout and progress display

Author: mat128

lib/vagrant-openstack-cloud-provider/action/create_server.rb

@@ -100,6 +100,7 @@ def call(env)
           end
 
           # Create the server
+          launch_start_time = Time.now
           server = env[:openstack_compute].servers.create(options)
 
           # Store the ID right away so we can track it
@@ -114,9 +115,12 @@ def call(env)
 
             # Wait for the server to be ready
             begin
-              (1..120).each do |n|
-                env[:ui].clear_line
-                env[:ui].report_progress(n, 120, true)
+              (1..config.instance_build_timeout).each do |n|
+                if config.report_progress
+                  env[:ui].clear_line
+                  env[:ui].report_progress(n, false)
+                end
+
                 server = env[:openstack_compute].servers.get(env[:machine].id)
                 break if self.server_to_be_available?(server)
                 sleep 1
@@ -128,6 +132,9 @@ def call(env)
             end
           end
 
+          env[:ui].info(I18n.t("vagrant_openstack.active",
+                        :elapsed => (Time.now - launch_start_time).floor))
+
           env[:machine].data_dir.join("cached_metadata").open("w+") do |f|
             f.write(server.to_json)
           end
@@ -136,7 +143,8 @@ def call(env)
             # Clear the line one more time so the progress is removed
             env[:ui].clear_line
             ssh_is_responding?(env)
-            env[:ui].info(I18n.t("vagrant_openstack.ready"))
+            env[:ui].info(I18n.t("vagrant_openstack.ready",
+                          :elapsed => (Time.now - launch_start_time).floor))
           end
 
           @app.call(env)

lib/vagrant-openstack-cloud-provider/config.rb

@@ -70,6 +70,14 @@ class Config < Vagrant.plugin("2", :config)
       # @return [Hash]
       attr_accessor :scheduler_hints
 
+      # @return [String]
+      attr_accessor :instance_build_timeout
+
+      # @return [Bool]
+      attr_accessor :report_progress
+      # alias_method :report_progress?, :report_progress
+
+
       def initialize
         @api_key  = UNSET_VALUE
         @endpoint = UNSET_VALUE
@@ -86,6 +94,8 @@ def initialize
         @networks = UNSET_VALUE
         @tenant = UNSET_VALUE
         @scheduler_hints = UNSET_VALUE
+        @instance_build_timeout = UNSET_VALUE
+        @report_progress = UNSET_VALUE
       end
 
       def finalize!
@@ -111,6 +121,8 @@ def finalize!
         @networks = [@public_network_name] if @networks == UNSET_VALUE
         @tenant = nil if @tenant == UNSET_VALUE
         @scheduler_hints = {} if @scheduler_hints == UNSET_VALUE
+        @instance_build_timeout = 120 if @instance_build_timeout == UNSET_VALUE
+        @report_progress = true if @report_progress == UNSET_VALUE
       end
 
       def validate(machine)

locales/en.yml

@@ -14,8 +14,10 @@ en:
       Launching a server with the following settings...
     not_created: |-
       The server hasn't been created yet. Run `vagrant up` first.
+    active: |-
+      The server was built in %{elapsed} seconds!
     ready: |-
-      The server is ready!
+      The server is ready after %{elapsed} seconds!
     rsync_folder: |-
       Rsyncing folder: %{hostpath} => %{guestpath}
     waiting_for_build: |-

spec/vagrant-openstack-cloud-provider/config_spec.rb

@@ -26,6 +26,8 @@
     its(:networks) { should eq(["public"]) }
     its(:tenant) { should be_nil }
     its(:scheduler_hints) { should eq({}) }
+    its(:instance_build_timeout) { should eq(120) }
+    its(:report_progress) { should be_true }
   end
 
   describe "overriding defaults" do
@@ -42,7 +44,9 @@
       :public_network_name,
       :networks,
       :tenant,
-      :scheduler_hints].each do |attribute|
+      :scheduler_hints,
+      :instance_build_timeout,
+      :report_progress].each do |attribute|
       it "should not default #{attribute} if overridden" do
         subject.send("#{attribute}=", "foo")
         subject.finalize!

vagrant-openstack-cloud-provider.gemspec

@@ -15,7 +15,7 @@ Gem::Specification.new do |gem|
 
   gem.add_runtime_dependency "fog", "~> 1.22"
 
-  gem.add_development_dependency "rake"
+  gem.add_development_dependency "rake", '< 11.0'
   gem.add_development_dependency "rspec", "~> 2.13.0"
 
   gem.files         = `git ls-files`.split($/)