vagrant-aws-mkubenka 0.7.2.pre.14 → 0.7.2.pre.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 57caf99fd4244bccd66fc088a92a36db978117d9
-  data.tar.gz: 313a558229f08330b0dc222f4ab3d3a30170d4cd
+  metadata.gz: e6b377a49b9f02ebf858273200441795823424b2
+  data.tar.gz: 91d1a7913c253396f30a475b5fb4d75f1e5e5575
 SHA512:
-  metadata.gz: d9214a0339db2a2e2a539eff94f423c8c1d789560f668d7ddb0c1d599a4dfafb13e5d7b8678dd6d0f55a84f061d759460f027bf11ecd9387bf02bdb89b7fbfbe
-  data.tar.gz: ab5dd8f185416140587b0507e994ac7e828f8076d8d23028bf805bdd3c12b2c16b14ee5b2096b655e371cfaaf48796f420535734b792a03661b3b1c8d213ff1a
+  metadata.gz: 13fbc1fe0d76ec1587f86894056d196d33da3a613774ef39195fe06b971e33510e9fd7c93d7b7a802533e118dcf2cfbced7c932a2d15c82b40b19f8303ed5d94
+  data.tar.gz: a21203e1230f16552e180c1671b2421b2c8d60132d6f1851a7df98b3b1272d0c4cafccb55a1269137f261f1b199d0d447be48c792a13f2de0776ab31929c8ab0

data/README.md

@@ -1,6 +1,6 @@
 # Vagrant AWS Provider
 
-[![Build Status](https://travis-ci.org/mkubenka/vagrant-aws.svg?branch=master)](https://travis-ci.org/mkubenka/vagrant-aws)
+[![Build Status](https://travis-ci.org/mkubenka/vagrant-aws.svg?branch=mkubenka)](https://travis-ci.org/mkubenka/vagrant-aws)
 [![Gem Version](https://badge.fury.io/rb/vagrant-aws-mkubenka.svg)](https://badge.fury.io/rb/vagrant-aws-mkubenka)
 
 This is a [Vagrant](http://www.vagrantup.com) 1.2+ plugin that adds an [AWS](http://aws.amazon.com)

data/lib/vagrant-aws/action/connect_aws.rb

@@ -15,7 +15,7 @@ module VagrantPlugins
 
         def call(env)
           # Get the region we're going to booting up in
-          region = env[:machine].provider_config.region
+          region = env[:machine].provider.region
 
           # Get the configs
           region_config = env[:machine].provider_config.get_region_config(region)

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

@@ -132,6 +132,11 @@ module VagrantPlugins
           # Immediately save the ID since it is created at this point.
           env[:machine].id = server.id
 
+          # Immediately save the region in which the instance was launched.
+          env[:machine].data_dir.join("region").open("w+") do |f|
+            f.write(region)
+          end
+
           # Wait for the instance to be ready first
           env[:metrics]["instance_ready_time"] = Util::Timer.time do
             tries = region_config.instance_ready_timeout / 2

data/lib/vagrant-aws/provider.rb

@@ -41,6 +41,18 @@ module VagrantPlugins
         Vagrant::MachineState.new(state_id, short, long)
       end
 
+      def region
+        # Return the region associated with the instance if the machine
+        # has already been launched, or return the default region configured.
+        machine_region_file = @machine.data_dir.join("region")
+
+        if File.exists?(machine_region_file)
+          return File.read(machine_region_file)
+        else
+          return @machine.provider_config.region
+        end
+      end
+
       def to_s
         id = @machine.id.nil? ? "new" : @machine.id
         "AWS (#{id})"