'address_id' now defaults to 'public', to reduce number of cases in r…

…ead_ssh_info.
where · May 6, 2013 · 1e03d16 · 1e03d16
1 parent 92ba812
commit 1e03d16
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/lib/vagrant-openstack-plugin/action/read_ssh_info.rb b/lib/vagrant-openstack-plugin/action/read_ssh_info.rb
@@ -33,10 +33,8 @@ def read_ssh_info(openstack, machine)
 
           if config.network
             host = server.addresses[config.network].last['addr'] rescue nil
-          elsif config.address_id
-            host = server.addresses[config.address_id].last['addr'] rescue nil
           else
-            host = server.addresses['public'].last['addr'] rescue nil
+            host = server.addresses[config.address_id].last['addr'] rescue nil
           end
           # Read the DNS info
           return {

diff --git a/lib/vagrant-openstack-plugin/config.rb b/lib/vagrant-openstack-plugin/config.rb
@@ -101,7 +101,7 @@ def finalize!
         @metadata = nil if @metadata == UNSET_VALUE
         @username = nil if @username == UNSET_VALUE
         @network = nil if @network == UNSET_VALUE
-        @address_id = nil if @address_id == UNSET_VALUE
+        @address_id = 'public' if @address_id == UNSET_VALUE
 
         # Keypair defaults to nil
         @keypair_name = nil if @keypair_name == UNSET_VALUE