vagrant-openstack-plugin 0.8.0 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 986c84ac3194d14ea6318c89ff6266e26535afa9
-  data.tar.gz: d78d410acf7bec163dd902a614b3dedafcbe3101
+  metadata.gz: 185cf5b53b90cdb94e096aa21dabfc5cd4ed5f35
+  data.tar.gz: 462aa860376af1b3ab089eff34a63aa7dc2b4021
 SHA512:
-  metadata.gz: 643ff0ffe7ab2c7f9ac797ffc48a6bbb6b32786141e8d4d264f8167820699692c38584feb872b555564beb3fc5b91028910ab35ebb72aca816551e5559773078
-  data.tar.gz: b995f34d40199ec3a153cb5d63776b5cca113fd81eac5b6a498742a883cbd3dd129644e7494a293497874237d73da4aea904bd355614d2e7d649df9005f5581b
+  metadata.gz: 508389f7abc296939c73d4f7f52bbc4f079ed4cec7bc9ffe157c0e01e5632eff70a456dfe9c3a47cf12480340821d33c292ac5dbf6f818ce0bb3042c696a8bbc
+  data.tar.gz: 8ab048e2dcdb4e2e2cb420715024089d0ff0cb02ebdb345d123810eba60e3975e8edc0fa3b5db1880b22f99ec67fe7bcaba0d9625c13c6cab612aea0d2e63827

data/CHANGELOG.md

@@ -1,5 +1,19 @@
 # Changelog for vagrant-openstack-plugin
 
+## 0.9.0
+
+- Merge pull request #80 from hawknewton/network_fix [view commit](http://github.com///commit/542e7a2e077d624df9cb56a53c24cf3450e11c71)
+- Merge pull request #86 from ipoddar-ibm/master [view commit](http://github.com///commit/11fccb73264aa852df88825936026a9da4771580)
+- Merge pull request #88 from chino/fix-rsync-identify-file-options [view commit](http://github.com///commit/9319af5216c8c65ba144154ddfba2c1d767c567d)
+- Merge pull request #87 from arbrandes/master [view commit](http://github.com///commit/49839de94e1865eb88a25d5876f1698e2069a0be)
+- sync_folders: should have space between ssh-i options [view commit](http://github.com///commit/07325bfe4c782043d7ecec32a64fa516344cebf8)
+- Allocate IPs automatically [view commit](http://github.com///commit/84c311544d00286fc2c910f9147892e5ae6c0a5b)
+- Adds support for static IPs and interface config [view commit](http://github.com///commit/a5fdb22e23687c9bcd540b37b65b8d478d3a5d94)
+- remove extra line [view commit](http://github.com///commit/010e347acf403d6426fffac5ec01cb999dd9545f)
+- fix typo [view commit](http://github.com///commit/08dda991121f7e2e2f5bb8f32e03432f69aec226)
+- support cygwin [view commit](http://github.com///commit/62c2184906e444c22933d34b8b9054fca56df54f)
+- Connect to openstack network resource when needed [view commit](http://github.com///commit/8515a9305f354963d8687077e203a35c902035ce)
+
 ## 0.8.0
 
 - Merge pull request #67 from pradels/master [view commit](http://github.com///commit/15f5b5531622376df952bccc0512a6de50d7a92f)

data/README.md

@@ -77,6 +77,7 @@ Vagrant.configure("2") do |config|
     os.security_groups    = ['ssh', 'http']    # optional
     os.tenant             = "YOUR TENANT_NAME" # optional
     os.floating_ip        = "33.33.33.33"      # optional (The floating IP to assign for this instance)
+    os.floating_ip_pool   = "public"           # optional (The floating IP pool to allocate addresses from, if floating_ip = :auto)
 
     os.orchestration_stack_name = 'stack01'				# optional
     os.orchestration_cfn_template_file = '/tmp/cfn_heat_template.json'	# optional
@@ -146,6 +147,9 @@ This provider exposes quite a few provider-specific configuration options:
 * `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.
+* `floating_ip_pool` - Floating ip pool to allocate IP addresses from, if
+  floating_ip is set to :auto.  Previously allocated addresses will not be
+  used, and addresses allocated here will be released when the VM is destroyed.
 * `orchestration_stack_name` - Name for orchestration stack. Mandatory
   parameter when creating new stack. One of parameters for template should be
   set with this parameter.

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

@@ -46,7 +46,7 @@ module VagrantPlugins
           env[:openstack_compute] = Fog::Compute.new(
             env[:fog_openstack_params])
 
-          if config.networks && !config.networks.empty?
+          if config.network || (config.networks && !config.networks.empty?)
             env[:openstack_network] = Fog::Network.new({
               :provider => :openstack,
               :connection_options => connection_options,

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

@@ -0,0 +1,52 @@
+require "log4r"
+
+require 'vagrant/util/scoped_hash_override'
+
+module VagrantPlugins
+  module OpenStack
+    module Action
+      class CreateNetworkInterfaces
+        include Vagrant::Util::ScopedHashOverride
+
+        def initialize(app, env)
+          @app    = app
+          @logger = Log4r::Logger.new("vagrant_openstack::action::create_network_interfaces")
+        end
+
+        def call(env)
+          networks_to_configure = []
+          env[:machine].config.vm.networks.each_with_index do |network, slot_number|
+            type = network[0]
+            original_options = network[1]
+            next if type != :private_network
+            next if original_options[:auto_config] === false
+            next if slot_number == 0
+
+            options = scoped_hash_override(original_options, :openstack)
+
+            @logger.info "Configuring interface slot_number #{slot_number} options #{options}"
+
+            network_to_configure = {
+              :interface => slot_number,
+            }
+
+            if options[:ip]
+              network_to_configure = {
+                :type    => :static,
+                :ip      => options[:ip],
+                :netmask => "255.255.255.0",
+              }.merge(network_to_configure)
+            else
+              network_to_configure[:type] = :dhcp
+            end
+
+            networks_to_configure.push(network_to_configure)
+          end
+          env[:ui].info I18n.t('vagrant.actions.vm.network.configuring')
+          env[:machine].guest.capability(:configure_networks, networks_to_configure)
+          @app.call(env)
+        end
+      end
+    end
+  end
+end

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

@@ -58,9 +58,24 @@ module VagrantPlugins
           unless config.networks.empty?
             env[:ui].info(I18n.t("vagrant_openstack.finding_network"))
             options[:nics] = Array.new
-            config.networks.each do |net|
-              network = find_matching(env[:openstack_network].networks, net)
-              options[:nics] << {"net_id" => network.id} if network
+            config.networks.each_with_index do |os_network_name, i|
+
+              # Use the configured OpenStack network, if it exists.
+              os_network = find_matching(env[:openstack_network].networks, os_network_name)
+              if os_network
+                current = { :net_id => os_network.id }
+
+                # Match the OpenStack network to a corresponding
+                # config.vm.network option.  If there is one, use that for its
+                # IP address.
+                config_network = env[:machine].config.vm.networks[i]
+                if config_network
+                  ip_address = config_network[1][:ip]
+                  current[:v4_fixed_ip] = ip_address if ip_address
+                end
+
+                options[:nics] << current
+              end
             end
             env[:ui].info("options[:nics]: #{options[:nics]}")
           end
@@ -98,15 +113,26 @@ module VagrantPlugins
               server.wait_for(5) { ready? }
               # Once the server is up and running assign a floating IP if we have one
               floating_ip = config.floating_ip
-              # try to automatically allocate a floating IP
+              # try to automatically associate a floating IP
               if floating_ip && 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
+                if config.floating_ip_pool
+                  env[:ui].info("Allocating floating IP address from pool: #{config.floating_ip_pool}")
+                  address = env[:openstack_compute].allocate_address(config.floating_ip_pool).body["floating_ip"]
+                  if address["ip"].nil?
+                    raise Errors::FloatingIPNotAllocated
+                  else
+                    floating_ip = address["ip"]
+                  end
+                else
+                  addresses = env[:openstack_compute].addresses
+                  puts addresses
+                  free_floating = addresses.find_index {|a| a.fixed_ip.nil?}
+                  if free_floating.nil?
+                    raise Errors::FloatingIPNotFound
+                  else
+                    floating_ip = addresses[free_floating].ip
+                  end
                 end
-                floating_ip = addresses[free_floating].ip
               end
                 
               if floating_ip

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

@@ -19,7 +19,16 @@ module VagrantPlugins
 
             # TODO: Validate the fact that we get a server back from the API.
             server = env[:openstack_compute].servers.get(id)
-            server.destroy
+            if server
+              ip = server.floating_ip_address
+              server.destroy
+              if machine.provider_config.floating_ip_pool
+                address = env[:openstack_compute].list_all_addresses.body["floating_ips"].find{|i| i["ip"] == ip}
+                if address
+                  env[:openstack_compute].release_address(address["id"])
+                end
+              end
+            end
           end
 
           @app.call(env)

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

@@ -1,6 +1,7 @@
 require "log4r"
 
 require "vagrant/util/subprocess"
+require "vagrant/util/which"
 
 module VagrantPlugins
   module OpenStack
@@ -25,7 +26,17 @@ module VagrantPlugins
               next
             end
 
+            unless Vagrant::Util::Which.which('rsync')
+              @logger.info "please install rsync first"
+              break
+            end
+
             hostpath  = File.expand_path(data[:hostpath], env[:root_path])
+            #rsync interprets paths with colons as remote locations.
+            # "cygdrive" path for cygwin on windows.
+            if Vagrant::Util::Platform.windows?
+              hostpath = Vagrant::Util::Subprocess.execute("cygpath", "-u", "-a", hostpath).stdout.chomp
+            end
             guestpath = data[:guestpath]
 
             # Make sure there is a trailing slash on the host path to
@@ -85,7 +96,7 @@ module VagrantPlugins
 
         def ssh_key_options(ssh_info)
           # Ensure that `private_key_path` is an Array (for Vagrant < 1.4)
-          Array(ssh_info[:private_key_path]).map { |path| "-i '#{path}'" }.join
+          Array(ssh_info[:private_key_path]).map { |path| "-i '#{path}' " }
         end
       end
     end

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

@@ -79,7 +79,6 @@ module VagrantPlugins
         Vagrant::Action::Builder.new.tap do |b|
           b.use Provision
           b.use SyncFolders
-          b.use WarnNetworks
           b.use SetHostname
         end
       end
@@ -95,6 +94,7 @@ module VagrantPlugins
               b1.use ConnectOpenStack
               b1.use CreateOrchestrationStack
               b1.use CreateServer
+              b1.use CreateNetworkInterfaces
             else
               b1.use action_resume
             end
@@ -230,6 +230,7 @@ module VagrantPlugins
       action_root = Pathname.new(File.expand_path("../action", __FILE__))
       autoload :ConnectOpenStack, action_root.join("connect_openstack")
       autoload :CreateServer, action_root.join("create_server")
+      autoload :CreateNetworkInterfaces, action_root.join("create_network_interfaces")
       autoload :DeleteServer, action_root.join("delete_server")
       autoload :HardRebootServer, action_root.join("hard_reboot_server")
       autoload :IsCreated, action_root.join("is_created")

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

@@ -89,6 +89,11 @@ module VagrantPlugins
       # @return [String]
       attr_accessor :floating_ip
 
+      # The floating IP pool from which IP addresses can be allocated
+      #
+      # @return [String]
+      attr_accessor :floating_ip_pool
+
       # The region to specify when the OpenStack cloud has multiple regions
       #
       # @return [String]
@@ -130,6 +135,7 @@ module VagrantPlugins
         @tenant = UNSET_VALUE
         @user_data = UNSET_VALUE
         @floating_ip = UNSET_VALUE
+        @floating_ip_pool = UNSET_VALUE
         @region = UNSET_VALUE
         @proxy = UNSET_VALUE
         @ssl_verify_peer = UNSET_VALUE
@@ -167,6 +173,7 @@ module VagrantPlugins
         @tenant = nil if @tenant == UNSET_VALUE
         @user_data = "" if @user_data == UNSET_VALUE
         @floating_ip = nil if @floating_ip == UNSET_VALUE
+        @floating_ip = nil if @floating_ip_pool == UNSET_VALUE
 
         @region = nil if @region == UNSET_VALUE
         @proxy = nil if @proxy == UNSET_VALUE

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

@@ -35,6 +35,10 @@ module VagrantPlugins
         error_key(:floating_ip_not_found)
       end
 
+      class FloatingIPNotAllocated < VagrantOpenStackError
+        error_key(:floating_ip_not_allocated)
+      end
+
       class OrchestrationTemplateError < VagrantOpenStackError
         error_key(:orchestration_template_error)
       end

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

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module OpenStack
-    VERSION = "0.8.0"
+    VERSION = "0.9.0"
   end
 end

data/locales/en.yml

@@ -93,6 +93,8 @@ en:
       floating_ip_not_found: |-
         A floating IP could not be allocated, as no available floating 
         IPs were found in OpenStack
+      floating_ip_not_allocated: |-
+        A floating IP could not be allocated from the pool.
       orchestration_template_error: |-
         There was an error while reading orchestration template.
         Error: %{err}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-openstack-plugin
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.9.0
 platform: ruby
 authors:
 - Edmund Haselwanter
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-26 00:00:00.000000000 Z
+date: 2014-11-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog
@@ -73,6 +73,7 @@ files:
 - lib/vagrant-openstack-plugin.rb
 - lib/vagrant-openstack-plugin/action.rb
 - lib/vagrant-openstack-plugin/action/connect_openstack.rb
+- lib/vagrant-openstack-plugin/action/create_network_interfaces.rb
 - lib/vagrant-openstack-plugin/action/create_orchestration_stack.rb
 - lib/vagrant-openstack-plugin/action/create_server.rb
 - lib/vagrant-openstack-plugin/action/delete_orchestration_stack.rb