vagrant-openstack-plugin 0.3.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
---- 
-SHA1: 
-  metadata.gz: fb275fa87d4601a051b59152af3219c4420bdb78
-  data.tar.gz: 9acfe025144bf974f4574475ea11457f05d83d14
-SHA512: 
-  metadata.gz: 03895c57bd627fba2402596e02eeb2384b137b23c8c6aafa120a97285b6675f923736b01065f0ceed6de4f83d9202dd507b3159d2af31142ce885ef2ae1835de
-  data.tar.gz: 9836a275ca793adf8168eeb12f851392bc9c1f95d4fbea4f337c1976a1a52bcaa3606037b67bc304580c54e25d0f2e1d9fefcea2599d02461c4c71971798ec91
+---
+SHA1:
+  metadata.gz: 0bcbaeca3f9db2c7bc8c3a6895eeb7f3a2f12726
+  data.tar.gz: c5598b5a10e611996fb677bd3014b765e0e59bf1
+SHA512:
+  metadata.gz: c2237cdfbffdb4b41ef3e5e1b5cfdcd5c8c8d46403645c59d30396e9ee25fcf11e4dd373f875ece6d1aa29e2fa32f5bb1875e912cefb0e820571ce55ad89f1a5
+  data.tar.gz: c362a66a69cc6fc6cf2c654de53b5a9c184d8e4f7ff525eaac601673741fb6af6e580241548dd1b323532178046cd8a966f7a1e57d9ae42d5e425d63150fb404

data/.travis.yml

@@ -0,0 +1,11 @@
+langauge: ruby
+script: rake test
+branches:
+  only:
+    - master
+rvm:
+  - 1.9.3
+  - 2.0.0
+matrix:
+  allow_failures:
+    - rvm: ruby-head

data/CHANGELOG.md

@@ -1,5 +1,25 @@
 # Changelog for vagrant-openstack-plugin
 
+## 0.4.0
+
+- fix version
+
+## 0.4.0
+
+- Merge pull request #49 from RackerJohnMadrid/fix-rsync-vagrant-1-4 [view commit](http://github.com/cloudbau/vagrant-openstack-plugin/commit/5664ead3fda8f889dad72de1de2fbb
+- fixes the issue of ssh keys now being represented as an Array in vagrant >= 1.4 [view commit](http://github.com/cloudbau/vagrant-openstack-plugin/commit/0741d802a13c4a858
+- fix regression wrt multiple nics [view commit](http://github.com/cloudbau/vagrant-openstack-plugin/commit/9c5441db359b34f2bbf66d30853c97b0896a494b)
+- update README [view commit](http://github.com/cloudbau/vagrant-openstack-plugin/commit/725e66ab7970e5698aa7347dae93f791e926097a)
+- implement multiple networks [view commit](http://github.com/cloudbau/vagrant-openstack-plugin/commit/0bbbda10bc3b6a09e3165936a2cd17d56b9d3159)
+- two minor rsync bugfixes [view commit](http://github.com/cloudbau/vagrant-openstack-plugin/commit/5bf54e8ab99baa850631803137d991a4756f34ab)
+- Merge pull request #33 from johnbellone/master [view commit](http://github.com/cloudbau/vagrant-openstack-plugin/commit/f863781405a1070fe991f55f93d2b37763f6c1da)
+- Add actions for pausing/suspending (and inverse). [view commit](http://github.com/cloudbau/vagrant-openstack-plugin/commit/a5ec0edd25af250599e0e248a25d8a34af0e1c40)
+- Merge pull request #31 from johnbellone/master [view commit](http://github.com/cloudbau/vagrant-openstack-plugin/commit/83031f79e5834693e2c45656c0ae17b6f13afe83)
+- Add a little debugging output. [view commit](http://github.com/cloudbau/vagrant-openstack-plugin/commit/c00310ed8855d3b2b0472ab9304debefbb0918e3)
+- Add travis.yml file to the project. [view commit](http://github.com/cloudbau/vagrant-openstack-plugin/commit/bc53baaa43c2bf652294d374e071c96bf00bcf12)
+- Add proxy option to configuration. [view commit](http://github.com/cloudbau/vagrant-openstack-plugin/commit/3d33bdc9a3bf28af7403bd1a0245a9869799eadc)
+
+
 ## 0.3.0 (September 25, 2013)
 
 - Adds support to determine IP address to use

data/Gemfile

@@ -6,5 +6,5 @@ group :development do
   # We depend on Vagrant for development, but we don't add it as a
   # gem dependency because we expect to be installed within the
   # Vagrant environment itself using `vagrant plugin`.
-  gem "vagrant", :git => "git://github.com/mitchellh/vagrant.git"
+  gem "vagrant", :git => "https://github.com/mitchellh/vagrant.git"
 end

data/README.md

@@ -68,6 +68,7 @@ Vagrant.configure("2") do |config|
     os.metadata  = {"key" => "value"}                      # optional
     os.user_data = "#cloud-config\nmanage_etc_hosts: True" # optional
     os.network            = "YOUR NETWORK_NAME"            # optional
+    os.networks           = [ "internal", "external" ]     # optional, overrides os.network
     os.address_id         = "YOUR ADDRESS ID"              # optional (`network` above has higher precedence)
     os.scheduler_hints    = {
         :cell => 'australia'
@@ -125,6 +126,7 @@ 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.
+* `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.
 * `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)
@@ -133,7 +135,7 @@ This provider exposes quite a few provider-specific configuration options:
 * `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.
 * `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.
 
 These can be set like typical provider-specific configuration:
 

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

@@ -22,9 +22,15 @@ module VagrantPlugins
           tenant = config.tenant
           region = config.region
 
+          # Pass proxy config down into the Fog::Connection object using
+          # the `connection_options` hash.
+          connection_options = { :proxy => config.proxy }
+
           @logger.info("Connecting to OpenStack...")
+          @logger.debug("API connection params: #{connection_options.inspect}")
           env[:openstack_compute] = Fog::Compute.new({
             :provider => :openstack,
+            :connection_options => connection_options,
             :openstack_username => username,
             :openstack_api_key => api_key,
             :openstack_auth_url => endpoint,
@@ -32,9 +38,10 @@ module VagrantPlugins
             :openstack_region => region
           })
 
-          if config.network
+          if config.network || config.networks
             env[:openstack_network] = Fog::Network.new({
               :provider => :openstack,
+              :connection_options => connection_options,
               :openstack_username => username,
               :openstack_api_key => api_key,
               :openstack_auth_url => endpoint,

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

@@ -45,11 +45,24 @@ module VagrantPlugins
             :availability_zone => config.availability_zone
           }
           
-          # Find a network if provided
-          if config.network
+          # Fallback to only one network, otherwise `config.networks` overrides
+          unless config.networks
+            if config.network
+              config.networks = [ config.network ]
+            else
+              config.networks = []
+            end
+          end
+
+          # Find networks if provided
+          if config.networks
             env[:ui].info(I18n.t("vagrant_openstack.finding_network"))
-            network = find_matching(env[:openstack_network].networks, config.network)
-            options[:nics] = [{"net_id" => network.id}] if 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
+            end
+            env[:ui].info("options[:nics]: #{options[:nics]}")
           end
           
           # Output the settings we're going to use to the user
@@ -57,8 +70,8 @@ module VagrantPlugins
           env[:ui].info(" -- Flavor: #{flavor.name}")
           env[:ui].info(" -- Image: #{image.name}")
           env[:ui].info(" -- Name: #{server_name}")
-          if network
-            env[:ui].info(" -- Network: #{network.name}")
+          config.networks.each do |n|
+            env[:ui].info(" -- Network: #{n}")
           end
           if config.security_groups
             env[:ui].info(" -- Security Groups: #{config.security_groups}")

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

@@ -0,0 +1,25 @@
+require "log4r"
+
+module VagrantPlugins
+  module OpenStack
+    module Action
+      # This pauses a running server, if there is one.
+      class PauseServer
+        def initialize(app, env)
+          @app    = app
+          @logger = Log4r::Logger.new("vagrant_openstack::action::pause_server")
+        end
+
+        def call(env)
+          if env[:machine].id
+            env[:ui].info(I18n.t("vagrant_openstack.pausing_server"))
+            server = env[:openstack_compute].servers.get(env[:machine].id)
+            server.pause
+          end
+
+          @app.call(env)
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,25 @@
+require "log4r"
+
+module VagrantPlugins
+  module OpenStack
+    module Action
+      # This starts a suspended server, if there is one.
+      class ResumeServer
+        def initialize(app, env)
+          @app    = app
+          @logger = Log4r::Logger.new("vagrant_openstack::action::resume_server")
+        end
+
+        def call(env)
+          if env[:machine].id
+            env[:ui].info(I18n.t("vagrant_openstack.resuming_server"))
+            server = env[:openstack_compute].servers.get(env[:machine].id)
+            server.resume
+          end
+
+          @app.call(env)
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,25 @@
+require "log4r"
+
+module VagrantPlugins
+  module OpenStack
+    module Action
+      # This deletes the running server, if there is one.
+      class SuspendServer
+        def initialize(app, env)
+          @app    = app
+          @logger = Log4r::Logger.new("vagrant_openstack::action::suspend_server")
+        end
+
+        def call(env)
+          if env[:machine].id
+            env[:ui].info(I18n.t("vagrant_openstack.suspending_server"))
+            server = env[:openstack_compute].servers.get(env[:machine].id)
+            server.suspend
+          end
+
+          @app.call(env)
+        end
+      end
+    end
+  end
+end

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

@@ -43,12 +43,25 @@ module VagrantPlugins
               "chown #{ssh_info[:username]} '#{guestpath}'")
 
             # Rsync over to the guest path using the SSH info
+            if env[:machine].config.ssh.proxy_command
+              proxy_cmd = "-o ProxyCommand='#{env[:machine].config.ssh.proxy_command}'"
+            else
+              proxy_cmd = ''
+            end
+
+            # poor workaround for poor ipv6 handling of rsync
+            if ssh_info[:host].include? ':'
+              user_at_host = "[#{ssh_info[:username]}@#{ssh_info[:host]}]"
+            else
+              user_at_host = ssh_info[:username] + "@" + ssh_info[:host]
+            end
+
             command = [
               "rsync", "--verbose", "--archive", "-z", "--delete",
               "--exclude", ".vagrant/",
-              "-e", "ssh -p #{ssh_info[:port]} -o StrictHostKeyChecking=no -i '#{ssh_info[:private_key_path]}'",
+              "-e", "ssh -p #{ssh_info[:port]} -o StrictHostKeyChecking=no #{proxy_cmd} #{ssh_key_options(ssh_info)}",
               hostpath,
-              "#{ssh_info[:username]}@#{ssh_info[:host]}:#{guestpath}"]
+              user_at_host + ":" + guestpath]
 
             r = Vagrant::Util::Subprocess.execute(*command)
             if r.exit_code != 0
@@ -59,6 +72,13 @@ module VagrantPlugins
             end
           end
         end
+
+        private
+
+        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
+        end
       end
     end
   end

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

@@ -0,0 +1,25 @@
+require "log4r"
+
+module VagrantPlugins
+  module OpenStack
+    module Action
+      # This starts the pause server, if there is one.
+      class UnpauseServer
+        def initialize(app, env)
+          @app    = app
+          @logger = Log4r::Logger.new("vagrant_openstack::action::unpause_server")
+        end
+
+        def call(env)
+          if env[:machine].id
+            env[:ui].info(I18n.t("vagrant_openstack.unpausing_server"))
+            server = env[:openstack_compute].servers.get(env[:machine].id)
+            server.unpause
+          end
+
+          @app.call(env)
+        end
+      end
+    end
+  end
+end

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

@@ -42,6 +42,9 @@ module VagrantPlugins
       # @return [String]
       attr_accessor :network
 
+      # @return [Array]
+      attr_accessor :networks
+
       # A specific address identifier to use when connecting.
       # Overrides `network` above if both are set.
       #
@@ -91,6 +94,11 @@ module VagrantPlugins
       # @return [String]
       attr_accessor :region
 
+      # The proxy to specify when making connection to OpenStack API.
+      #
+      # @return [String]
+      attr_accessor :proxy
+
       def initialize
         @api_key  = UNSET_VALUE
         @endpoint = UNSET_VALUE
@@ -101,6 +109,7 @@ module VagrantPlugins
         @username = UNSET_VALUE
         @keypair_name = UNSET_VALUE
         @network  = UNSET_VALUE
+        @networks  = UNSET_VALUE
         @address_id  = UNSET_VALUE
         @scheduler_hints = UNSET_VALUE
         @availability_zone = UNSET_VALUE
@@ -110,6 +119,7 @@ module VagrantPlugins
         @user_data = UNSET_VALUE
         @floating_ip = UNSET_VALUE
         @region = UNSET_VALUE
+        @proxy = UNSET_VALUE
       end
 
       def finalize!
@@ -121,6 +131,7 @@ module VagrantPlugins
         @metadata = nil if @metadata == UNSET_VALUE
         @username = nil if @username == UNSET_VALUE
         @network = nil if @network == UNSET_VALUE
+        @networks = nil if @networks == UNSET_VALUE
         @address_id = 'public' if @address_id == UNSET_VALUE
 
         # Keypair defaults to nil
@@ -139,6 +150,7 @@ module VagrantPlugins
         @floating_ip = nil if @floating_ip == UNSET_VALUE
 
         @region = nil if @region == UNSET_VALUE
+        @proxy = nil if @proxy == UNSET_VALUE
       end
 
       def validate(machine)

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

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module OpenStack
-    VERSION = "0.3.0"
+    VERSION = "0.4.1"
   end
 end

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

@@ -22,6 +22,7 @@ describe VagrantPlugins::OpenStack::Config do
     its(:security_groups) { should be_nil }
     its(:scheduler_hints) { should be_nil }
     its(:tenant) { should be_nil }
+    its(:proxy) { should be_nil }
   end
 
   describe "overriding defaults" do
@@ -36,7 +37,8 @@ describe VagrantPlugins::OpenStack::Config do
       :ssh_username,
       :security_groups,
       :scheduler_hints,
-      :tenant].each do |attribute|
+      :tenant,
+      :proxy].each do |attribute|
       it "should not default #{attribute} if overridden" do
         subject.send("#{attribute}=".to_sym, "foo")
         subject.finalize!

metadata

@@ -1,60 +1,68 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: vagrant-openstack-plugin
-version: !ruby/object:Gem::Version 
-  version: 0.3.0
+version: !ruby/object:Gem::Version
+  version: 0.4.1
 platform: ruby
-authors: 
+authors:
 - Mitchell Hashimoto
 - Thomas Kadauke
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2013-09-25 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2014-05-12 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: fog
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    requirements: 
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
     - - ">="
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 1.10.1
   type: :runtime
   prerelease: false
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.10.1
+- !ruby/object:Gem::Dependency
   name: rake
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    requirements: 
-    - &id004 
-      - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
         version: 2.13.0
   type: :development
   prerelease: false
-  version_requirements: *id003
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.13.0
 description: Enables Vagrant to manage machines in OpenStack Cloud.
-email: 
+email:
 - mitchell@hashicorp.com
 - t.kadauke@cloudbau.de
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
-- .gitignore
+files:
+- ".gitignore"
+- ".travis.yml"
 - Authors.txt
 - CHANGELOG.md
 - Gemfile
@@ -72,9 +80,13 @@ files:
 - lib/vagrant-openstack-plugin/action/is_created.rb
 - lib/vagrant-openstack-plugin/action/message_already_created.rb
 - lib/vagrant-openstack-plugin/action/message_not_created.rb
+- lib/vagrant-openstack-plugin/action/pause_server.rb
 - lib/vagrant-openstack-plugin/action/read_ssh_info.rb
 - lib/vagrant-openstack-plugin/action/read_state.rb
+- lib/vagrant-openstack-plugin/action/resume_server.rb
+- lib/vagrant-openstack-plugin/action/suspend_server.rb
 - lib/vagrant-openstack-plugin/action/sync_folders.rb
+- lib/vagrant-openstack-plugin/action/unpause_server.rb
 - lib/vagrant-openstack-plugin/action/warn_networks.rb
 - lib/vagrant-openstack-plugin/config.rb
 - lib/vagrant-openstack-plugin/errors.rb
@@ -86,26 +98,26 @@ files:
 - vagrant-openstack-plugin.gemspec
 homepage: http://www.vagrantup.com
 licenses: []
-
 metadata: {}
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - *id004
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - *id004
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - ">="
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - ">="
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 2.1.3
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Enables Vagrant to manage machines in OpenStack Cloud.
-test_files: 
+test_files:
 - spec/vagrant-openstack-plugin/config_spec.rb