vagrant-openstack-plugin 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 01d0a86ac145465d408d91c5387d8892c176006c
-  data.tar.gz: 78e8230f1fad0b44aeb1bd695b5215328edfdfe5
+  metadata.gz: e4976e05ab97957b747ce3dae9d7fc11aaf54f74
+  data.tar.gz: b3b2758a7ac7d5469d0f15a14a4eaff1a85af7e8
 SHA512:
-  metadata.gz: 89a2d4209381bf135c4fa5b6d97888d862bf68a8882fa25a9f85667e494e46216d978eba1a8437a4c202f9ce9c1b13cbcc6d467289eea143813a30b8ae461977
-  data.tar.gz: 0181830fd9f026b958b95afd454e4a28e1026aa65f1dc2c8c235cdbcdf85bf57c6c1730c8b358e91a97bb12a156bfd24652b1cbb6e2318b7204223ce878b8a0e
+  metadata.gz: d9a5e64bb5ce88778ba6572a9939a7ef8d1253d00d1fdb3180dda49b0defb7a998b49f9d03bb0f42d4c22956854f6346e39bb796525aca107620a1cfa6d5e364
+  data.tar.gz: b61c45b9fdfdeb03a50f2ba88c4d2425b112ffe397d720f9ff7baec6e7e3e7788ba5885555c4d464a936d0ac375453533cb5f58617ec54538b4f41f0922c2e1a

data/CHANGELOG.md

@@ -1,7 +1,17 @@
 # Changelog for vagrant-openstack-plugin
 
+## 0.6.0
+
+- Merge pull request #59 from virtuald/fixed_automatic_ip [view commit](http://github.com///commit/7e7867ee7340515a8d0171fe5ea88aa340646e0f)
+- Update README with additional information about automatic allocation [view commit](http://github.com///commit/ea4ee9f409f61a2583588d3782701fe66239bd24)
+- Allow address_id to use the automatically assigned floating ip [view commit](http://github.com///commit/cb0e29c20e7105dae2a6534ccaebbe656c0d8419)
+- Update README [view commit](http://github.com///commit/b26f70653fb7cfbfe9604031d82aa42d4a324421)
+- Add support for automatically allocating a floating IP [view commit](http://github.com///commit/aee3129fc6020d3e3a6cc8db28b9b1c812225fbc)
+- update changelog [view commit](http://github.com///commit/936a2eef3d802d65a9f0753b5652ef4a8dbdb345)
+
 ## 0.5.0
 
+
 - Merge pull request #45 from detiber/fixNetworksPR [view commit](http://github.com///commit/56b28eff5a1079c6805ec944b1a0c1dde458b10e)
 - Merge pull request #53 from tjheeta/remote_machine_id [view commit](http://github.com///commit/5873d1b5282fe2d24a0e725ec6289d1ba5e20e9b)
 - Merge pull request #54 from last-g/patch-1 [view commit](http://github.com///commit/7941573ef8f547a915e31c51ab4d1b85b878eebe)

data/README.md

@@ -128,7 +128,8 @@ This provider exposes quite a few provider-specific configuration options:
   vagrant network configurations.
 * `networks` - An array of names or ids to create a server with multiple network interfaces. This overrides the `network` setting.
 * `address_id` - A specific address identifier to use when connecting to the
-  instance. `network` has higher precedence.
+  instance. `network` has higher precedence. If set to :floating_ip, then 
+  the floating IP address will be used. 
 * `scheduler_hints` - Pass hints to the open stack scheduler, see `--hint` flag in [OpenStack filters doc](http://docs.openstack.org/trunk/openstack-compute/admin/content/scheduler-filters.html)
 * `availability_zone` - Specify the availability zone in which the instance
   must be created.
@@ -137,6 +138,8 @@ This provider exposes quite a few provider-specific configuration options:
 * `region` - Region Name. Specify the region you want the instance to be launched in for multi-region environments.
 * `proxy` - HTTP proxy. When behind a firewall override this value for API access.
 * `ssl_verify_peer` - sets the ssl_verify_peer on the underlying excon connection - useful for self signed certs etc.
+* `floating_ip` - Floating ip. The floating IP to assign for this instance. If
+  set to :auto, then this assigns any available floating IP to the instance.
 
 These can be set like typical provider-specific configuration:
 

data/lib/vagrant-openstack-plugin/action/create_server.rb

@@ -95,11 +95,27 @@ module VagrantPlugins
             begin
               server.wait_for(5) { ready? }
               # Once the server is up and running assign a floating IP if we have one
-              if config.floating_ip
-                env[:ui].info( "Using floating IP #{config.floating_ip}")
-                floater = env[:openstack_compute].addresses.find { |thisone| thisone.ip.eql? config.floating_ip }
+              floating_ip = config.floating_ip
+              # try to automatically allocate a floating IP
+              if floating_ip.to_sym == :auto
+                addresses = env[:openstack_compute].addresses
+                puts addresses
+                free_floating = addresses.find_index {|a| a.fixed_ip.nil?}
+                if free_floating.nil?
+                  raise Errors::FloatingIPNotFound
+                end
+                floating_ip = addresses[free_floating].ip
+              end
+                
+              if floating_ip
+                env[:ui].info( "Using floating IP #{floating_ip}")
+                floater = env[:openstack_compute].addresses.find { |thisone| thisone.ip.eql? floating_ip }
                 floater.server = server
               end
+              
+              # store this so we can use it later
+              env[:floating_ip] = floating_ip
+              
             rescue RuntimeError => e
               # If we don't have an error about a state transition, then
               # we just move on.

data/lib/vagrant-openstack-plugin/action/read_ssh_info.rb

@@ -12,12 +12,12 @@ module VagrantPlugins
         end
 
         def call(env)
-          env[:machine_ssh_info] = read_ssh_info(env[:openstack_compute], env[:machine])
+          env[:machine_ssh_info] = read_ssh_info(env[:openstack_compute], env[:machine], env[:floating_ip])
 
           @app.call(env)
         end
 
-        def read_ssh_info(openstack, machine)
+        def read_ssh_info(openstack, machine, floating_ip)
             id = machine.id || openstack.servers.all( :name => machine.name ).first.id rescue nil
           return nil if id.nil?
           server = openstack.servers.get(id)
@@ -38,7 +38,11 @@ module VagrantPlugins
           if config.network
             host = server.addresses[config.network].last['addr'] rescue nil
           else
-            host = server.addresses[config.address_id].last['addr'] rescue nil
+            if config.address_id.to_sym == :floating_ip
+              host = floating_ip
+            else
+              host = server.addresses[config.address_id].last['addr'] rescue nil
+            end
           end
 
           # If host is still nil, try to find the IP address another way
@@ -46,10 +50,10 @@ module VagrantPlugins
             @logger.debug("Was unable to determine what network to use. Trying to find a valid IP to use.")
             if server.public_ip_addresses.length > 0
               @logger.debug("Public IP addresses available: #{server.public_ip_addresses}")
-              if config.floating_ip
-                if server.public_ip_addresses.include?(config.floating_ip)
+              if floating_ip
+                if server.public_ip_addresses.include?(floating_ip)
                   @logger.debug("Using the floating IP defined in Vagrantfile.")
-                  host = config.floating_ip
+                  host = machine.floating_ip
                 else
                   @logger.debug("The floating IP that was specified is not available to this instance.")
                   raise Errors::FloatingIPNotValid

data/lib/vagrant-openstack-plugin/errors.rb

@@ -30,6 +30,10 @@ module VagrantPlugins
       class FloatingIPNotValid < VagrantOpenStackError
         error_key(:floating_ip_not_valid)
       end
+      
+      class FloatingIPNotFound < VagrantOpenStackError
+        error_key(:floating_ip_not_found)
+      end
     end
   end
 end

data/lib/vagrant-openstack-plugin/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module OpenStack
-    VERSION = "0.5.0"
+    VERSION = "0.6.0"
   end
 end

data/locales/en.yml

@@ -62,6 +62,9 @@ en:
       floating_ip_not_valid: |-
         The floating IP specified in the Vagrantfile does not match an
         available public IP address returned by OpenStack.
+      floating_ip_not_found: |-
+        A floating IP could not be allocated, as no available floating 
+        IPs were found in OpenStack
     states:
       short_active: |-
         active

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-openstack-plugin
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Edmund Haselwanter
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-20 00:00:00.000000000 Z
+date: 2014-05-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog