vagrant-openstack-plugin 0.1.2 → 0.1.3

data/lib/vagrant-openstack-plugin.rb

@@ -4,7 +4,7 @@ require "vagrant-openstack-plugin/plugin"
 
 module VagrantPlugins
   module OpenStack
-    lib_path = Pathname.new(File.expand_path("../vagrant-openstack", __FILE__))
+    lib_path = Pathname.new(File.expand_path("../vagrant-openstack-plugin", __FILE__))
     autoload :Errors, lib_path.join("errors")
 
     # This initializes the i18n load path so that the plugin-specific

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

@@ -28,6 +28,15 @@ module VagrantPlugins
             :openstack_auth_url => endpoint
           })
 
+          if config.network
+            env[:openstack_network] = Fog::Network.new({
+              :provider => :openstack,
+              :openstack_username => username,
+              :openstack_api_key => api_key,
+              :openstack_auth_url => endpoint
+            })
+          end
+
           @app.call(env)
         end
       end

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

@@ -44,8 +44,15 @@ module VagrantPlugins
             :image_ref   => image.id,
             :name        => server_name,
             :key_name    => config.keypair_name,
+            :metadata    => config.metadata,
             :user_data_encoded => Base64.encode64(config.user_data)
           }
+          
+          # Find a network if provided
+          if config.network
+            network = find_matching(env[:openstack_network].networks, config.network)
+            options[:nics] = [{"net_id" => network.id}] if network
+          end
 
           # Create the server
           server = env[:openstack_compute].servers.create(options)

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

@@ -31,7 +31,11 @@ module VagrantPlugins
 
           config = machine.provider_config
 
-          host = server.addresses['public'].last['addr'] rescue nil
+          if config.network
+            host = server.addresses[config.network].last['addr'] rescue nil
+          else
+            host = server.addresses['public'].last['addr'] rescue nil
+          end
           # Read the DNS info
           return {
             # Usually there should only be one public IP

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

@@ -38,7 +38,8 @@ module VagrantPlugins
             # Rsync over to the guest path using the SSH info
             command = [
               "rsync", "--verbose", "--archive", "-z",
-              "-e", "ssh -p #{ssh_info[:port]} -i '#{ssh_info[:private_key_path]}'",
+              "--exclude", ".vagrant/",
+              "-e", "ssh -p #{ssh_info[:port]} -o StrictHostKeyChecking=no -i '#{ssh_info[:private_key_path]}'",
               hostpath,
               "#{ssh_info[:username]}@#{ssh_info[:host]}:#{guestpath}"]
 

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

@@ -36,6 +36,11 @@ module VagrantPlugins
       #
       # @return [String]
       attr_accessor :keypair_name
+      
+      # Network configurations for the instance
+      #
+      # @return [String]
+      attr_accessor :network
 
       # The SSH username to use with this OpenStack instance. This overrides
       # the `config.ssh.username` variable.
@@ -43,6 +48,11 @@ module VagrantPlugins
       # @return [String]
       attr_accessor :ssh_username
 
+      # A Hash of metadata that will be sent to the instance for configuration
+      #
+      # @return [Hash]
+      attr_accessor :metadata
+
       # User data to be sent to the newly created OpenStack instance. Use this
       # e.g. to inject a script at boot time.
       #
@@ -55,8 +65,10 @@ module VagrantPlugins
         @flavor   = UNSET_VALUE
         @image    = UNSET_VALUE
         @server_name = UNSET_VALUE
+        @metatdata = UNSET_VALUE
         @username = UNSET_VALUE
         @keypair_name = UNSET_VALUE
+        @network  = UNSET_VALUE
         @ssh_username = UNSET_VALUE
         @user_data = UNSET_VALUE
       end
@@ -67,7 +79,9 @@ module VagrantPlugins
         @flavor   = /m1.tiny/ if @flavor == UNSET_VALUE
         @image    = /cirros/ if @image == UNSET_VALUE
         @server_name = nil if @server_name == UNSET_VALUE
+        @metadata = {} if @metadata == UNSET_VALUE
         @username = nil if @username == UNSET_VALUE
+        @network = nil if @network == UNSET_VALUE
 
         # Keypair defaults to nil
         @keypair_name = nil if @keypair_name == UNSET_VALUE
@@ -84,6 +98,7 @@ module VagrantPlugins
 
         errors << I18n.t("vagrant_openstack.config.api_key_required") if !@api_key
         errors << I18n.t("vagrant_openstack.config.username_required") if !@username
+        errors << I18n.t("vagrant_openstack.config.metadata_must_be_hash") if !@metadata.is_a?(Hash) 
         
         { "OpenStack Provider" => errors }
       end

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

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module OpenStack
-    VERSION = "0.1.2"
+    VERSION = "0.1.3"
   end
 end

data/locales/en.yml

@@ -30,6 +30,8 @@ en:
         An API key is required.
       username_required: |-
         A username is required.
+      metadata_must_be_hash: |-
+        Metadata must be a hash.
 
     errors:
       create_bad_state: |-

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

@@ -18,6 +18,7 @@ describe VagrantPlugins::OpenStack::Config do
     its(:username) { should be_nil }
     its(:keypair_name) { should be_nil }
     its(:ssh_username) { should be_nil }
+    its(:network) { should be_nil }
   end
 
   describe "overriding defaults" do
@@ -28,6 +29,7 @@ describe VagrantPlugins::OpenStack::Config do
       :server_name,
       :username,
       :keypair_name,
+      :network,
       :ssh_username].each do |attribute|
       it "should not default #{attribute} if overridden" do
         subject.send("#{attribute}=".to_sym, "foo")

data/vagrant-openstack-plugin.gemspec

@@ -12,7 +12,7 @@ Gem::Specification.new do |gem|
   gem.summary       = "Enables Vagrant to manage machines in OpenStack Cloud."
   gem.homepage      = "http://www.vagrantup.com"
 
-  gem.add_runtime_dependency "fog"
+  gem.add_runtime_dependency "fog", ">= 1.10.1"
 
   gem.add_development_dependency "rake"
   gem.add_development_dependency "rspec", "~> 2.13.0"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-openstack-plugin
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
   prerelease: 
 platform: ruby
 authors:
@@ -19,7 +19,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.10.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -27,7 +27,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.10.1
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -111,7 +111,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4588673756793297691
+      hash: -4139560228461145832
 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: -4588673756793297691
+      hash: -4139560228461145832
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24