Merge pull request #3 from sharabash/pr1-region-fix

Get region value from provider.region, fix for a12ccea
mkubenka · Oct 10, 2017 · 5ec4001 · 5ec4001
2 parents 00ca219 + 712c1c9
commit 5ec4001
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 6 deletions.
diff --git a/lib/vagrant-aws/action/package_instance.rb b/lib/vagrant-aws/action/package_instance.rb
@@ -52,7 +52,7 @@ def call(env)
             env[:metrics]["instance_ready_time"] = Util::Timer.time do
 
               # Get the config, to set the ami burn timeout
-              region = env[:machine].provider_config.region
+              region = env[:machine].provider.region
               region_config = env[:machine].provider_config.get_region_config(region)
               tries = region_config.instance_package_timeout / 2
 
@@ -128,7 +128,7 @@ def clean_temp_dir
         def create_vagrantfile env
           File.open(File.join(env["export.temp_dir"], "Vagrantfile"), "w") do |f|
             f.write(TemplateRenderer.render("vagrant-aws_package_Vagrantfile", {
-              region: env[:machine].provider_config.region,
+              region: env[:machine].provider.region,
               ami: @ami_id,
               template_root: template_root
             }))

diff --git a/lib/vagrant-aws/action/read_ssh_info.rb b/lib/vagrant-aws/action/read_ssh_info.rb
@@ -31,7 +31,7 @@ def read_ssh_info(aws, machine)
 
           # read attribute override
           ssh_host_attribute = machine.provider_config.
-              get_region_config(machine.provider_config.region).ssh_host_attribute
+              get_region_config(machine.provider.region).ssh_host_attribute
           # default host attributes to try. NOTE: Order matters!
           ssh_attrs = [:dns_name, :public_ip_address, :private_ip_address]
           ssh_attrs = (Array(ssh_host_attribute) + ssh_attrs).uniq if ssh_host_attribute

diff --git a/lib/vagrant-aws/action/run_instance.rb b/lib/vagrant-aws/action/run_instance.rb
@@ -22,7 +22,7 @@ def call(env)
           env[:metrics] ||= {}
 
           # 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)

diff --git a/lib/vagrant-aws/action/terminate_instance.rb b/lib/vagrant-aws/action/terminate_instance.rb
@@ -13,7 +13,7 @@ def initialize(app, env)
 
         def call(env)
           server         = env[:aws_compute].servers.get(env[:machine].id)
-          region         = env[:machine].provider_config.region
+          region         = env[:machine].provider.region
           region_config  = env[:machine].provider_config.get_region_config(region)
 
           elastic_ip     = region_config.elastic_ip

diff --git a/lib/vagrant-aws/util/elb.rb b/lib/vagrant-aws/util/elb.rb
@@ -34,7 +34,7 @@ def adjust_availability_zones(env, elb)
         instances = env[:aws_compute].servers.all("instance-id" => elb.instances)
 
         azs = if instances.empty?
-                ["#{env[:machine].provider_config.region}a"]
+                ["#{env[:machine].provider.region}a"]
               else
                 instances.map(&:availability_zone).uniq
               end