vagrant-openstack-plugin 0.2.0 → 0.2.1

data/README.md

@@ -64,9 +64,12 @@ Vagrant.configure("2") do |config|
     os.endpoint = "KEYSTONE AUTH URL"      # "#{ENV['OS_AUTH_URL']}/tokens"  
     os.keypair_name = "YOUR KEYPAIR NAME"
     os.ssh_username = "SSH USERNAME"
-
     os.metadata = {"key" => "value"}       # Optional
     os.network = "YOUR NETWORK_NAME"       # Optional
+    os.address_id = "YOUR ADDRESS ID"      # Optional (`network` above has higher precedence)
+    os.scheduler_hints = {
+        :cell => 'australia'
+    }                                      # Optional
     os.security_groups = ['ssh', 'http']   # Optional
     os.tenant = "YOUR TENANT_NAME"         # Optional
 
@@ -119,6 +122,9 @@ This provider exposes quite a few provider-specific configuration options:
 * `network` - A name or id that will be used to fetch network configuration
   data when configuring the instance. NOTE: This is not compliant with the
   vagrant network configurations.
+* `address_id` - A specific address identifier to use when connecting to the
+  instance. `network` has higher precedence.
+* `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)
 * `security_groups` - List of security groups to be applied to the machine.
 * `tenant` - Tenant name.  You only need to specify this if your OpenStack user has access to multiple tenants.
 

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

@@ -39,8 +39,9 @@ module VagrantPlugins
             :name        => server_name,
             :key_name    => config.keypair_name,
             :metadata    => config.metadata,
-            :user_data_encoded => Base64.encode64(config.user_data),
-            :security_groups => config.security_groups
+            :user_data   => config.user_data,
+            :security_groups => config.security_groups,
+            :os_scheduler_hints => config.scheduler_hints
           }
           
           # Find a network if provided
@@ -81,6 +82,12 @@ module VagrantPlugins
             # Wait for the server to be ready
             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 }
+                floater.server = server
+              end
             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

@@ -34,7 +34,7 @@ module VagrantPlugins
           if config.network
             host = server.addresses[config.network].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 {

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

@@ -42,6 +42,14 @@ module VagrantPlugins
       # @return [String]
       attr_accessor :network
 
+      # A specific address identifier to use when connecting.
+      # Overrides `network` above if both are set.
+      #
+      attr_accessor :address_id
+
+      # Pass hints to the OpenStack scheduler, e.g. { "cell": "some cell name" }
+      attr_accessor :scheduler_hints
+
       # List of strings representing the security groups to apply.
       # e.g. ['ssh', 'http']
       #
@@ -69,7 +77,11 @@ module VagrantPlugins
       #
       # @return [String]
       attr_accessor :user_data
-
+      
+      # The floating IP address from the IP pool which will be assigned to the instance.
+      #
+      # @return [String]
+      attr_accessor :floating_ip
       def initialize
         @api_key  = UNSET_VALUE
         @endpoint = UNSET_VALUE
@@ -80,10 +92,13 @@ module VagrantPlugins
         @username = UNSET_VALUE
         @keypair_name = UNSET_VALUE
         @network  = UNSET_VALUE
+        @address_id  = UNSET_VALUE
+        @scheduler_hints = UNSET_VALUE
         @security_groups = UNSET_VALUE
         @ssh_username = UNSET_VALUE
         @tenant = UNSET_VALUE
         @user_data = UNSET_VALUE
+        @floating_ip = UNSET_VALUE
       end
 
       def finalize!
@@ -95,10 +110,12 @@ module VagrantPlugins
         @metadata = nil if @metadata == UNSET_VALUE
         @username = nil if @username == UNSET_VALUE
         @network = nil if @network == UNSET_VALUE
+        @address_id = 'public' if @address_id == UNSET_VALUE
 
         # Keypair defaults to nil
         @keypair_name = nil if @keypair_name == UNSET_VALUE
 
+        @scheduler_hints = nil if @scheduler_hints == UNSET_VALUE
         @security_groups = nil if @security_groups == UNSET_VALUE
 
         # The SSH values by default are nil, and the top-level config
@@ -107,6 +124,7 @@ module VagrantPlugins
 
         @tenant = nil if @tenant == UNSET_VALUE
         @user_data = "" if @user_data == UNSET_VALUE
+        @floating_ip = nil if @floating_ip == UNSET_VALUE
       end
 
       def validate(machine)

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

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module OpenStack
-    VERSION = "0.2.0"
+    VERSION = "0.2.1"
   end
 end

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

@@ -20,6 +20,7 @@ describe VagrantPlugins::OpenStack::Config do
     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 }
   end
 
@@ -34,6 +35,7 @@ describe VagrantPlugins::OpenStack::Config do
       :network,
       :ssh_username,
       :security_groups,
+      :scheduler_hints,
       :tenant].each do |attribute|
       it "should not default #{attribute} if overridden" do
         subject.send("#{attribute}=".to_sym, "foo")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-openstack-plugin
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-02 00:00:00.000000000 Z
+date: 2013-05-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog
@@ -111,7 +111,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1985565957385980271
+      hash: 515236456888934213
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -120,7 +120,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1985565957385980271
+      hash: 515236456888934213
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24