vagrant-openstack-cloud-provider 1.1.6 → 1.1.8

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    YjQwMjhkOTY1MjA4MjcwMmY3ZTc2MDcxNDMxYzY5NmNhYTQ5ZmMyNA==
-  data.tar.gz: !binary |-
-    YWY1YmQ1OWEyMjE4Yzg1OTZiZDI0ZjQ3NWQxNzc0NGEzY2U4M2M2ZQ==
+SHA1:
+  metadata.gz: 2b182a701fd3c8e02f164f19c6726ac2b541b4ca
+  data.tar.gz: bb49494f4566256877a45da8ee63a86c9cfc9608
 SHA512:
-  metadata.gz: !binary |-
-    OThjNTk2YzNlMDNhMDdmMDM0NTk3OTJhMDUzMzRhNGQyMGI4MzcwYjUxNzRi
-    NGQ5MWQ2ZTkyYTc1MTZjYWY1ODgzMjBiMzJmOWJkNGExYTg3YWFkNGU1YWM1
-    Y2E3YTliOTk4ZjM1OWZlMmQxMTMyMmU1ZDVjY2M0ZDAzODU5ZjQ=
-  data.tar.gz: !binary |-
-    ZGU4ZWU1ODU4YjY5N2NmODlhYmFmNzYzY2NjYWFhMGEyODc1OGRjNmE4MjMz
-    YzM3ZDZkYjZmZDdiODkyMzU1YzJmNTViOTMwOGIyZDliOTFmNzgyNzA0YWJm
-    NjEwZjIyMzA0YmExNmU5YTdmZTU3ODI0NWYzMzVlMzc0YTk2MTQ=
+  metadata.gz: 6df57c41d76339adbbfbaca7e803005fe5b59b3ffaf9eb761cfa33b75d7f9990f4fd8d4938a8f6dafe3cc177577a3de29af3d23416cd22ad78590657b95888e5
+  data.tar.gz: 5b88e61657a1134664e58359d24739b1305323f51824a2c2107fc78c1cae6641a62923db85e60e39859bb776a81067e309bf4ee10e0650dab56b9561049ae21f

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

@@ -100,6 +100,7 @@ module VagrantPlugins
           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 @@ module VagrantPlugins
 
             # 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 @@ module VagrantPlugins
             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 @@ module VagrantPlugins
             # 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)

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

@@ -70,6 +70,14 @@ module VagrantPlugins
       # @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 @@ module VagrantPlugins
         @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 @@ module VagrantPlugins
         @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)

data/lib/vagrant-openstack-cloud-provider/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module OpenStack
-    VERSION = "1.1.6"
+    VERSION = "1.1.8"
   end
 end

data/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: |-

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

@@ -26,6 +26,8 @@ describe VagrantPlugins::OpenStack::Config do
     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 @@ describe VagrantPlugins::OpenStack::Config do
       :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!

data/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($/)

metadata

@@ -1,55 +1,55 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-openstack-cloud-provider
 version: !ruby/object:Gem::Version
-  version: 1.1.6
+  version: 1.1.8
 platform: ruby
 authors:
 - Mathieu Mitchell
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-09 00:00:00.000000000 Z
+date: 2017-01-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.22'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.22'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '11.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '11.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.13.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.13.0
 description: Vagrant provider for OpenStack clouds.
@@ -59,8 +59,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - AUTHORS
 - Gemfile
 - LICENSE.txt
@@ -103,12 +103,12 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []