vagrant-openstack-cloud-provider 1.1.9 → 1.1.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 757087dec480ba560e7fcd2d238842934b5c5084
-  data.tar.gz: 5a2516fb166f82f322f54f5abbefc8b38adc39c5
+  metadata.gz: a0485390c70b7dfaeb04bfd416fecafb72e5d7d1
+  data.tar.gz: 0c9f67996fdcfb1ca5b13def83560b9d142b3a70
 SHA512:
-  metadata.gz: 65b8aa57e0fb0df88abef0b65f9949b0a9e4e8cf8de267946a3205e250d36b9841ce025e6ed56b292467aa2c35ac168eb67a4ce4a13fcec24e4345e13cfb9517
-  data.tar.gz: c3f159790ba459a74093074590bd7a31ae22c244f2dfc388aeba6d8f905fb8c4601926c17b4596882f597d8d488bd4cabcfe899ac05232d89897fe64930012d2
+  metadata.gz: 15ebcaa621e8b1b07a955d3287e5bcb52844ac18110521a5c65c6ceac91b607d6738a4a4998bfde9f905173717daeae76fad1c16f6c5626256715f6e49020f25
+  data.tar.gz: 83f140f1a941a0547ba18c1f5c3bce7581ec6ab51e21e9f8294c5ccd25c92d5a0035d8e5bbf8cffee62601b1852656afa132793aee0dc0133c9f6ed3314240cd

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

@@ -26,8 +26,11 @@ module VagrantPlugins
               :openstack_tenant => config.tenant
           }
 
-          env[:openstack_compute] = get_fog_promise('Compute', openstack_options)
-          env[:openstack_network] = get_fog_promise('Network', openstack_options)
+          $openstack_compute ||= get_fog_promise('Compute', openstack_options)
+          $openstack_network ||= get_fog_promise('Network', openstack_options)
+
+          env[:openstack_compute] = $openstack_compute
+          env[:openstack_network] = $openstack_network
 
           @app.call(env)
         end
@@ -35,7 +38,7 @@ module VagrantPlugins
         private
 
         def get_fog_promise(service_name, openstack_options)
-          promise {
+          Kernel.promise {
             @logger.info("Initializing OpenStack #{service_name}...")
             Fog.const_get(service_name).new(openstack_options)
           }

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

@@ -122,10 +122,11 @@ module VagrantPlugins
 
           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
+          public_ip_address = server.addresses[config.public_network_name].last['addr'] rescue nil
+          env[:ui].info("Instance IP address: #{public_ip_address}")
 
           unless env[:interrupted]
             # Clear the line one more time so the progress is removed

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

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module OpenStack
-    VERSION = "1.1.9"
+    VERSION = "1.1.10"
   end
 end

data/spec/vagrant-openstack-cloud-provider/action/connect_openstack_spec.rb

@@ -21,6 +21,11 @@ RSpec.describe VagrantPlugins::OpenStack::Action::ConnectOpenStack do
       described_class.new(app, nil)
     }
 
+    after(:each) {
+      $openstack_compute = nil
+      $openstack_network = nil
+    }
+
     it "should new members in env" do
       expect(app).to receive(:call)
       expect(machine).to receive(:provider_config).and_return(config)
@@ -47,6 +52,14 @@ RSpec.describe VagrantPlugins::OpenStack::Action::ConnectOpenStack do
       end
     end
 
+    it "should memoize the fog call" do
+      expect(app).to receive(:call).at_least(:once)
+      expect(machine).to receive(:provider_config).at_least(:once).and_return(config)
+      env = { :machine => machine }
+
+      expect(Kernel).to receive(:promise).twice.and_return('TEST') # 1x compute, 1x network
+      10.times { subject.call(env) }
+    end
   end
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-openstack-cloud-provider
 version: !ruby/object:Gem::Version
-  version: 1.1.9
+  version: 1.1.10
 platform: ruby
 authors:
 - Mathieu Mitchell
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-24 00:00:00.000000000 Z
+date: 2017-01-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog