vagrant-openstack-plugin 0.11.1 → 0.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c685d66661ea243dc4d8c73b8f4c817c5d8c1661
-  data.tar.gz: 2202e0c0a24bf6527c7cc5011aea420db83732c3
+  metadata.gz: c446b86835b0354be7f63cf8d9e61281681ac655
+  data.tar.gz: ed7c805fe05803e7c412d33e8ed36c0bdb2cb7af
 SHA512:
-  metadata.gz: f637c987968a37910aafd222c466037f0eccbce39774693b95d8dc5fee3c47764f6caad178a5ba1ae4bfe68460d011e4a7357329889b9d1a840cbae5bba811b7
-  data.tar.gz: cc0a8cfac02294cbb496844568b56b636013bf3c50517d00a18b8872251ff98177c23fb5b713809e55fabcffc906c13ea90472eb5672f5e22f035f1c1ac63803
+  metadata.gz: e394d3b39dc0d3020dec63beb7c27333c5e9507869c608193736c2acdfb9541e728d9a6c3b308781a5774df17484f935fa3cbf3fe38493a07ad25c961443666d
+  data.tar.gz: 9e34fdca9c3c9297b61416896354cb9c20aff52e71fd553d39d9d120f28a9b8d6640f06c3f92b289eab83d725b65c0d5b2dd173a98662cf106e5eca60c4ff3f9

data/CHANGELOG.md

@@ -1,5 +1,24 @@
 # Changelog for vagrant-openstack-plugin
 
+## 0.12.0 (2015/08/27)
+
+- be more specific on using symbols in the config. fixes cloudbau/vagrant-openstack-plugin#106 [view commit](http://github.com///commit/0ef0865c6e38debd77982310073fe09cd99c6054)
+- Merge pull request #103 from corpix/ssh_ip_family [view commit](http://github.com///commit/6ca314cc0cdbbe62bd4b80e65e518103ce73b027)
+- Merge pull request #109 from joelanford/floating-ip-fix [view commit](http://github.com///commit/2bf8a08494a8aa4a5a5eae677691c56b9748208b)
+- Merge pull request #118 from maxx/master [view commit](http://github.com///commit/eadeaa992ad7f2b1e43d35843fdfdc2fda661e3d)
+- allows an alternative to os.floating_ip :auto, called os.floating_ip :associate_unassigned. This pulls an unassigned IP address from an existing pool with pre-allocated IP's, and will not try to allocate a new IP. If an IP is not available, no floating IP is assigned. Relevant errors and documentation added as well [view commit](http://github.com///commit/adc708405c47c44ef60ccdc5df4d9f6f04cd5a1f)
+- Fixes issue #100, where config.rb incorrectly handled floating_ip and floating_ip_pool configurations [view commit](http://github.com///commit/21f8532e726d21d75788dcd3d6cdd0ec84acc633)
+- Merge pull request #107 from Chealion/handleEphemeralDisks [view commit](http://github.com///commit/338e0525397bd710e351cb7a6eadcb801b2255f6)
+- Merge pull request #104 from cshaffer/upgrade_rsepc [view commit](http://github.com///commit/533c0ac004be755e973098c6589b4cf6b1fdc696)
+- Add ability to handle swap and ephemeral disks to disks feature [view commit](http://github.com///commit/c4f7acea6e2d97d040184534403fee2262671176)
+- Convert specs to RSpec 3.1.7 syntax with Transpec [view commit](http://github.com///commit/6115ccb73c8e28704bbe8efb5d079d35b1d0d844)
+- Upgrade rspec to 3.1.0 [view commit](http://github.com///commit/c0dfe22fdd7c9d2e72c02187491acea7b9e1b013)
+- Convert specs to RSpec 2.14.8 syntax with Transpec [view commit](http://github.com///commit/dd34a0eed957e190fec369f43514c8a5d4549833)
+- Upgrade rspec to 2.14 first [view commit](http://github.com///commit/332c537e4f028bc8ab4ffd630c75a32ca93a681f)
+- Removed debug printing [view commit](http://github.com///commit/59a8f024d090fff5ae28d30ef72a24d2f58044c3)
+- Updated readme [view commit](http://github.com///commit/815f05d770f9991fa5e333ae24e15fde801643d7)
+- IP address family match support [view commit](http://github.com///commit/5aa125c0e741496c60927cff9a413e942d9f2720)
+
 ## 0.11.1
 
 - Merge pull request #99 from jtopjian/master [view commit](http://github.com///commit/1c2667532e408f239761882a367c11d948610f37)

data/README.md

@@ -66,6 +66,8 @@ Vagrant.configure("2") do |config|
     os.keypair_name = "YOUR KEYPAIR NAME"      # as stored in Nova
     os.ssh_username = "SSH USERNAME"           # login for the VM
 
+    os.ssh_ip_family = "ipv6"                  # IP address family
+
     os.metadata  = {"key" => "value"}                      # optional
     os.user_data = "#cloud-config\nmanage_etc_hosts: True" # optional
     os.network            = "YOUR NETWORK_NAME"            # optional
@@ -77,8 +79,8 @@ Vagrant.configure("2") do |config|
     os.availability_zone  = "az0001"           # optional
     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, or set to :auto)
-    os.floating_ip_pool   = "public"           # optional (The floating IP pool to allocate addresses from, if floating_ip = :auto)
+    os.floating_ip        = "33.33.33.33"      # optional (The floating IP to assign for this instance, or set to :auto or :associate_unassigned (ruby symbol, no quotes!))
+    os.floating_ip_pool   = "public"           # optional (The floating IP pool to allocate addresses to, if floating_ip = :auto, or the pool to pull the next available IP from if floating_ip = :associate_unassigned (ruby symbol, no quotes!))
 
     os.disks              = [                  # optional
                              {"name" => "volume_name_here", "description" => "A 10GB Volume", "size" => 10},
@@ -89,7 +91,7 @@ Vagrant.configure("2") do |config|
     os.orchestration_cfn_template_file = '/tmp/cfn_heat_template.json'	# optional
     os.orchestration_cfn_template_parameters = {			# optional
       'NetworkName' => 'net_01'
-    } 
+    }
   end
 end
 ```
@@ -133,7 +135,9 @@ This provider exposes quite a few provider-specific configuration options:
 * `username` - The username with which to access OpenStack.
 * `keypair_name` - The name of the keypair to access the machine.
 * `ssh_username` - The username to access the machine. This can also be
-  configured using the standard config.ssh.username configuration value.
+configured using the standard config.ssh.username configuration value.
+* `ssh_ip_family` - The IP address family to use for SSH connection. It could be `ipv6` or `ipv4`.
+This option takes effect only if virtual machine have multiple addresses.
 * `metadata` - A set of key pair values that will be passed to the instance
   for configuration.
 * `network` - A name or id that will be used to fetch network configuration
@@ -141,8 +145,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. If set to :floating_ip, then 
-  the floating IP address will be used. 
+  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.
@@ -152,7 +156,7 @@ This provider exposes quite a few provider-specific configuration options:
 * `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.
+  set to :auto, then this assigns any available floating IP to the instance. If set to :associate_unassigned, then it will use the next IP address which is unasssigned in the pool specified in floating_ip_pool.
 * `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.

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

@@ -113,7 +113,7 @@ 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 associate a floating IP
+              # try to automatically allocate and  associate a floating IP
               if floating_ip && floating_ip.to_sym == :auto
                 if config.floating_ip_pool
                   env[:ui].info("Allocating floating IP address from pool: #{config.floating_ip_pool}")
@@ -125,7 +125,6 @@ module VagrantPlugins
                   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
@@ -134,9 +133,35 @@ module VagrantPlugins
                   end
                 end
               end
+               
+              # try to automatically associate the next available unassigned ip in the given pool
+              if floating_ip && floating_ip.to_sym == :associate_unassigned
+                if config.floating_ip_pool
+                  env[:ui].info("Associating floating IP address from pool: #{config.floating_ip_pool}")
+                  addresses = env[:openstack_compute].addresses
+
+                  # grab the next available IP in this pool which is not currently allocated:
+                  address = env[:openstack_compute].addresses.find { |thisone|
+                      (thisone.attributes[:pool].eql? config.floating_ip_pool and thisone.attributes[:instance_id].nil?)
+                  }
+
+                  if address.nil?
+                    raise Errors::FloatingUnassignedIPNotFound
+                  else
+                      floating_ip = address.attributes[:ip]
+                  end
+                  result = env[:openstack_compute].associate_address(server.id,floating_ip)
+                  if result[:status] != 202
+                    raise Errors::FloatingIPFailedAssociate
+                  else
+                    env[:ui].info("Found and Associated floating IP address #{address.attributes[:ip]} from pool #{config.floating_ip_pool}")
+                  end
+                else
+                  raise Errors::FloatingUnassignedRequiresPool
+                end
+              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
@@ -167,7 +192,16 @@ module VagrantPlugins
                   # mount points are not expected to be meaningful
                   # add useful support if your cloud respects them
                   begin
-                    server.attach_volume(disk["volume_id"], "/dev/vd#{("a".."z").to_a[server.volume_attachments.length + 1]}")
+                    # Assume instance has only one disk
+                    nova_offset = 1
+                    # Increase counter in case we have swap or ephemeral disks.
+                    if flavor.swap != 0
+                        nova_offset += 1
+                    end
+                    if flavor.ephemeral != 0
+                        nova_offset += 1
+                    end
+                    server.attach_volume(disk["volume_id"], "/dev/vd#{("c".."z").to_a[server.volume_attachments.length + nova_offset]}")
                     server.wait_for{ volume_attachments.any?{|vol| vol["id"]==disk["volume_id"]} }
                   rescue Excon::Errors::Error => e
                     raise Errors::VolumeBadState, :volume => disk["name"], :state => e.message

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

@@ -1,4 +1,5 @@
 require "log4r"
+require "ipaddr"
 
 module VagrantPlugins
   module OpenStack
@@ -64,8 +65,19 @@ module VagrantPlugins
               end
             elsif server.private_ip_addresses.length > 0
               @logger.debug("Private IP addresses available: #{server.private_ip_addresses}")
-              host = server.private_ip_address
-              @logger.debug("Using the first available private IP address: #{host}.")
+              if config.ssh_ip_family.nil?
+                host = server.private_ip_address
+                @logger.debug("Using the first available private IP address: #{host}.")
+              else
+                for ip in server.private_ip_addresses
+                  addr = IPAddr.new ip
+                  if addr.send("#{config.ssh_ip_family}?".to_sym)
+                    host = ip.to_s
+                    @logger.debug("Using the first available #{config.ssh_ip_family} IP address: #{host}.")
+                    break
+                  end
+                end
+              end
             end
           end
 

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

@@ -68,6 +68,11 @@ module VagrantPlugins
       # @return [String]
       attr_accessor :ssh_username
 
+      # The IP address family that will be used to connect to the instance
+      #
+      # @return [String]
+      attr_accessor :ssh_ip_family
+
       # A Hash of metadata that will be sent to the instance for configuration
       #
       # @return [Hash]
@@ -137,6 +142,7 @@ module VagrantPlugins
         @availability_zone = UNSET_VALUE
         @security_groups = UNSET_VALUE
         @ssh_username = UNSET_VALUE
+        @ssh_ip_family = UNSET_VALUE
         @tenant = UNSET_VALUE
         @user_data = UNSET_VALUE
         @floating_ip = UNSET_VALUE
@@ -175,11 +181,12 @@ module VagrantPlugins
         # The SSH values by default are nil, and the top-level config
         # `config.ssh` values are used.
         @ssh_username = nil if @ssh_username == UNSET_VALUE
+        @ssh_ip_family = nil if @ssh_ip_family == UNSET_VALUE
 
         @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
+        @floating_ip_pool = nil if @floating_ip_pool == UNSET_VALUE
 
         @disks = nil if @disks == UNSET_VALUE
 

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

@@ -43,6 +43,18 @@ module VagrantPlugins
         error_key(:floating_ip_not_allocated)
       end
 
+      class FloatingUnassignedIPNotFound < VagrantOpenStackError
+        error_key(:floating_unassigned_ip_not_found)
+      end
+
+      class FloatingIPFailedAssociate < VagrantOpenStackError
+        error_key(:floating_ip_failed_associate)
+      end
+
+      class FloatingUnassignedRequiresPool < VagrantOpenStackError
+        error_key(:floating_unassigned_requires_pool)
+      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.11.1'
+    VERSION = '0.12.0'
   end
 end

data/locales/en.yml

@@ -112,6 +112,12 @@ en:
         IPs were found in OpenStack
       floating_ip_not_allocated: |-
         A floating IP could not be allocated from the pool.
+      floating_unassigned_ip_not_found: |-
+        An unassigned floating IP could not be found in the specified pool.
+      floating_ip_failed_associate: |-
+        The selected IP failed to associate
+      floating_unassigned_requires_pool: |-
+        You must specifiy a pool in floating_ip_pool when using associate_unassigned
       orchestration_template_error: |-
         There was an error while reading orchestration template.
         Error: %{err}

data/spec/vagrant-openstack-plugin/config_spec.rb

@@ -10,21 +10,80 @@ describe VagrantPlugins::OpenStack::Config do
       end
     end
 
-    its(:api_key)  { should be_nil }
-    its(:endpoint) { should be_nil }
-    its(:flavor)   { should eq(/m1.tiny/) }
-    its(:image)    { should eq(/cirros/) }
-    its(:server_name) { should be_nil }
-    its(:username) { should be_nil }
-    its(:keypair_name) { should be_nil }
-    its(:ssh_username) { should be_nil }
-    its(:network) { should be_nil }
-    its(:security_groups) { should be_nil }
-    its(:scheduler_hints) { should be_nil }
-    its(:tenant) { should be_nil }
-    its(:proxy) { should be_nil }
-    its(:disks) { should be_nil }
-    its(:ssl_verify_peer) { should be_nil }
+    describe '#api_key' do
+      subject { super().api_key }
+      it { is_expected.to be_nil }
+    end
+
+    describe '#endpoint' do
+      subject { super().endpoint }
+      it { is_expected.to be_nil }
+    end
+
+    describe '#flavor' do
+      subject { super().flavor }
+      it { is_expected.to eq(/m1.tiny/) }
+    end
+
+    describe '#image' do
+      subject { super().image }
+      it { is_expected.to eq(/cirros/) }
+    end
+
+    describe '#server_name' do
+      subject { super().server_name }
+      it { is_expected.to be_nil }
+    end
+
+    describe '#username' do
+      subject { super().username }
+      it { is_expected.to be_nil }
+    end
+
+    describe '#keypair_name' do
+      subject { super().keypair_name }
+      it { is_expected.to be_nil }
+    end
+
+    describe '#ssh_username' do
+      subject { super().ssh_username }
+      it { is_expected.to be_nil }
+    end
+
+    describe '#network' do
+      subject { super().network }
+      it { is_expected.to be_nil }
+    end
+
+    describe '#security_groups' do
+      subject { super().security_groups }
+      it { is_expected.to be_nil }
+    end
+
+    describe '#scheduler_hints' do
+      subject { super().scheduler_hints }
+      it { is_expected.to be_nil }
+    end
+
+    describe '#tenant' do
+      subject { super().tenant }
+      it { is_expected.to be_nil }
+    end
+
+    describe '#proxy' do
+      subject { super().proxy }
+      it { is_expected.to be_nil }
+    end
+
+    describe '#disks' do
+      subject { super().disks }
+      it { is_expected.to be_nil }
+    end
+
+    describe '#ssl_verify_peer' do
+      subject { super().ssl_verify_peer }
+      it { is_expected.to be_nil }
+    end
   end
 
   describe "overriding defaults" do
@@ -45,13 +104,13 @@ describe VagrantPlugins::OpenStack::Config do
       it "should not default #{attribute} if overridden" do
         subject.send("#{attribute}=".to_sym, "foo")
         subject.finalize!
-        subject.send(attribute).should == "foo"
+        expect(subject.send(attribute)).to eq("foo")
       end
     end
     it "should not default disks if overridden" do
       subject.send("disks=".to_sym, {"name" => "foo", "size" => 10, "description" => "bar"})
       subject.finalize!
-      subject.send("disks").should == {"name" => "foo", "size" => 10, "description" => "bar"}
+      expect(subject.send("disks")).to eq({"name" => "foo", "size" => 10, "description" => "bar"})
     end
   end
 

data/vagrant-openstack-plugin.gemspec

@@ -15,7 +15,7 @@ Gem::Specification.new do |gem|
   gem.add_runtime_dependency "fog", ">= 1.16.0"
 
   gem.add_development_dependency "rake"
-  gem.add_development_dependency "rspec", "~> 2.13.0"
+  gem.add_development_dependency "rspec", "~> 3.1.0"
 
   gem.files         = `git ls-files`.split($/)
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-openstack-plugin
 version: !ruby/object:Gem::Version
-  version: 0.11.1
+  version: 0.12.0
 platform: ruby
 authors:
 - Edmund Haselwanter
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-05 00:00:00.000000000 Z
+date: 2015-08-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.13.0
+        version: 3.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.13.0
+        version: 3.1.0
 description: Enables Vagrant to manage machines in OpenStack Cloud.
 email:
 - me@ehaselwanter.com
@@ -131,7 +131,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.3
 signing_key: 
 specification_version: 4
 summary: Enables Vagrant to manage machines in OpenStack Cloud.