vagrant-rackspace 0.1.4 → 0.1.5

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ODA5MmJhZGMzMzRlYmE2NTJmMGVmMWRkNTM2Y2ZjNzA4MWRmNzZkNg==
+    NzUyZjc0ZDA4OWM5ODRmYTczMjE2N2ZhMTY0MTAwN2QyMjA1NjdlYg==
   data.tar.gz: !binary |-
-    OWFkY2M1MTVlYTRhY2QyMDJkNzMyZmM1NGE3ODNjNjdjMTc4ZWYyNg==
+    NGNiZDA2MzM4NjQ3YmU2MmUyMWMzNjMyZTcyZTRjYjlhNTdlNjdlYw==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    YzE1YjAwOGYwNTc1MjQxNzY0NmU5MjM1MmQzMTZjNGQ4ZTUwYjhmOGRmMzU1
-    NDM3OTU0NzVjZWQ0M2EzMWRjMzExZmEyYWFhZjNiMWQ3MmRiNTE5ZmMwNmZm
-    ZjRmOGJhNjJkOTc0YTMxYjI2MjZiNWYzNGE5N2I4M2QwNmIwMDE=
+    Zjc4NjA0MWRkZmU5NzE1Y2VmODQ2YTk1OTkxZGY2M2U1ZWM4ODk4NGNlZDNm
+    MWJmODk5YmI0MTFmNmFiOWVhMjBiMjE4M2E0MDNlODZmN2U5MzA4YjIwNTM0
+    Mjk2NmRmNGEzMTkzY2JlZjBiMjVjZjg5N2MyMmNjYTY0ODJkOTg=
   data.tar.gz: !binary |-
-    YTllOWVkZTNiMGQ4ZWJkMTFiM2YzNzZkMmZkNjdlZjRlNzliZjhmNTlhYjVl
-    N2M2YmIzYmJhNThmYzFmY2ZmZDVmMTI3ODc3MjY5MTNjYWMyODZkNjRiOGIx
-    YWVjYjE0NDM2N2M5Mzk2YTZmMTcwZGI0NDg3YTNlN2Y4MTM0OTQ=
+    MWRiYmZlNGVkYTU2MjQyMzE0NzdhYzMxZmY1ZmQ3YjUzOWVlMjJmZTFhOTY0
+    NzQzZTM0NzA4MmNhOTMxNjlmNWRiYTA3ZTg3MWQ1NzE5ZjVhOWRkYTQ5MjUw
+    MWQ1NWU5MjdjZjNiNjFiNWFiNjE4N2I0Y2FlNTYxMzAyZmE3YmQ=

data/.gitignore

@@ -5,6 +5,7 @@
 .vagrant
 .yardoc
 Gemfile.lock
+gemfiles/*.lock
 InstalledFiles
 _yardoc
 coverage

data/.travis.yml

@@ -2,4 +2,11 @@ language: ruby
 rvm:
   - 1.9.3
   - 2.0.0
+  - 2.1.0
+script: "appraisal rake"
+gemfile:
+  - Gemfile
+  - gemfiles/latest_stable.gemfile
+  - gemfiles/oldest_current.gemfile
+  - gemfiles/previous_release.gemfile
 

data/Appraisals

@@ -0,0 +1,14 @@
+appraise "latest-stable" do
+  gem "vagrant", :git => 'git://github.com/mitchellh/vagrant.git', :branch => 'v1.4.2'
+end
+
+# Oldest (current release)
+appraise "oldest-current" do
+  gem "vagrant", :git => 'git://github.com/mitchellh/vagrant.git', :branch => 'v1.4.0'
+end
+
+# Latest patch (previous release)
+appraise "previous-release" do
+  gem "vagrant", :git => 'git://github.com/mitchellh/vagrant.git', :branch => 'v1.3.5'
+end
+

data/CHANGELOG.md

@@ -1,3 +1,16 @@
+# 0.1.5 (January 8, 2014)
+
+IMPROVEMENTS:
+
+  - Fix Vagrant 1.4 compatibility and support multiple SSH keys [GH-58]
+  - Add uploaded keypair support [GH-53]
+  - Add ssh_run support, for vagrant ssh -c [GH-57]
+  - Requires fog 1.19 [GH-65]
+
+BUG FIXES:
+
+  - Remove networks warning as vagrant-rackspace now supports networks [GH-64]
+
 # 0.1.4 (October 15, 2013)
 
 IMPROVEMENTS:

data/Gemfile

@@ -2,10 +2,13 @@ source 'https://rubygems.org'
 
 gemspec
 
+gem "appraisal", "1.0.0.beta2"
+gem "vagrant", :git => "git://github.com/mitchellh/vagrant.git"
+
 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 'coveralls', require: false
 end
+

data/README.md

@@ -30,6 +30,16 @@ $ vagrant up --provider=rackspace
 Of course prior to doing this, you'll need to obtain an Rackspace-compatible
 box file for Vagrant.
 
+### CentOS / RHEL (sudo: sorry, you must have a tty to run sudo)
+
+The default configuration of the RHEL family of Linux distributions requires a tty in order to run sudo.  Vagrant does not connect with a tty by default, so you may experience the error:
+> sudo: sorry, you must have a tty to run sudo
+
+The best way to take deal with this error is to upgrade to Vagrant 1.4 or later, and enable:
+```
+config.ssh.pty = true
+```
+
 ## Quick Start
 
 After installing the plugin (instructions above), the quickest way to get
@@ -99,6 +109,8 @@ vagrant will authenticate against the UK authentication endpoint.
 * `public_key_path` - The path to a public key to initialize with the remote
   server. This should be the matching pair for the private key configured
   with `config.ssh.private_key_path` on Vagrant.
+* `key_name` - If a public key has been [uploaded to the account already](http://docs.rackspace.com/servers/api/v2/cs-devguide/content/ServersKeyPairs-d1e2545.html), the uploaded key can be used to initialize the remote server by providing its name.  The uploaded public key should be the matching pair for the private key configured
+  with `config.ssh.private_key_path` on Vagrant.
 * `server_name` - The name of the server within RackSpace Cloud. This
   defaults to the name of the Vagrant machine (via `config.vm.define`), but
   can be overridden with this.

data/features/provision.feature

@@ -14,15 +14,14 @@ Feature: vagrant-rackspace fog tests
 
       config.vm.box = "dummy"
       config.ssh.private_key_path = "~/.ssh/id_rsa"
-      config.ssh.max_tries     = 1
-      config.ssh.timeout       = 10
+
 
       config.vm.provider :rackspace do |rs|
         rs.server_name = 'vagrant-provisioned-server'
         rs.username = ENV['RAX_USERNAME']
         rs.api_key  = ENV['RAX_API_KEY']
         rs.rackspace_region   = ENV['RAX_REGION'].downcase.to_sym
-        rs.flavor   = /512MB/
+        rs.flavor   = /1 GB Performance/
         rs.image    = /Ubuntu/
         rs.public_key_path = "~/.ssh/id_rsa.pub"
       end

data/features/vagrant-rackspace.feature

@@ -22,15 +22,13 @@ Feature: vagrant-rackspace fog tests
       config.vm.box = "dummy"
       config.ssh.username = "vagrant" if Fog.mock?
       config.ssh.private_key_path = "~/.ssh/id_rsa" unless Fog.mock?
-      config.ssh.max_tries     = 1
-      config.ssh.timeout       = 10
 
       config.vm.provider :rackspace do |rs|
         rs.server_name = 'vagrant-single-server'
         rs.username = ENV['RAX_USERNAME']
         rs.api_key  = ENV['RAX_API_KEY']
         rs.rackspace_region = ENV['RAX_REGION'].downcase.to_sym
-        rs.flavor   = /512MB/
+        rs.flavor   = /1 GB Performance/
         rs.image    = /Ubuntu/
         rs.public_key_path = "~/.ssh/id_rsa.pub" unless Fog.mock?
       end
@@ -41,7 +39,7 @@ Feature: vagrant-rackspace fog tests
     # And I get the server from "Instance ID:"
     Then the server "vagrant-single-server" should be active
 
-Scenario: Create a single server (compute_url)
+Scenario: Create a single server (rackspace_compute_url)
     Given a file named "Vagrantfile" with:
     """
     # Testing options
@@ -54,15 +52,13 @@ Scenario: Create a single server (compute_url)
       config.vm.box = "dummy"
       config.ssh.username = "vagrant" if Fog.mock?
       config.ssh.private_key_path = "~/.ssh/id_rsa" unless Fog.mock?
-      config.ssh.max_tries     = 1
-      config.ssh.timeout       = 10
 
       config.vm.provider :rackspace do |rs|
         rs.server_name = 'vagrant-single-server'
         rs.username = ENV['RAX_USERNAME']
         rs.api_key  = ENV['RAX_API_KEY']
-        rs.compute_url = "https://#{ENV['RAX_REGION'].downcase}.servers.api.rackspacecloud.com/v2"
-        rs.flavor   = /512MB/
+        rs.rackspace_compute_url = "https://#{ENV['RAX_REGION'].downcase}.servers.api.rackspacecloud.com/v2"
+        rs.flavor   = /1 GB Performance/
         rs.image    = /Ubuntu/
         rs.public_key_path = "~/.ssh/id_rsa.pub" unless Fog.mock?
       end

data/gemfiles/latest_stable.gemfile

@@ -0,0 +1,12 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "appraisal", "1.0.0.beta2"
+gem "vagrant", :git=>"git://github.com/mitchellh/vagrant.git", :branch=>"v1.4.2"
+
+group :development do
+  gem "coveralls", :require=>false
+end
+
+gemspec :path=>".././"

data/gemfiles/oldest_current.gemfile

@@ -0,0 +1,12 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "appraisal", "1.0.0.beta2"
+gem "vagrant", :git=>"git://github.com/mitchellh/vagrant.git", :branch=>"v1.4.0"
+
+group :development do
+  gem "coveralls", :require=>false
+end
+
+gemspec :path=>".././"

data/gemfiles/previous_release.gemfile

@@ -0,0 +1,12 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "appraisal", "1.0.0.beta2"
+gem "vagrant", :git=>"git://github.com/mitchellh/vagrant.git", :branch=>"v1.3.5"
+
+group :development do
+  gem "coveralls", :require=>false
+end
+
+gemspec :path=>".././"

data/lib/vagrant-rackspace/action/create_server.rb

@@ -32,12 +32,15 @@ module VagrantPlugins
           # Figure out the name for the server
           server_name = config.server_name || env[:machine].name
 
-          # If we're using the default keypair, then show a warning
-          default_key_path = Vagrant.source_root.join("keys/vagrant.pub").to_s
-          public_key_path  = File.expand_path(config.public_key_path, env[:root_path])
-
-          if default_key_path == public_key_path
-            env[:ui].warn(I18n.t("vagrant_rackspace.warn_insecure_ssh"))
+          # If we are using a key name, can ignore the public key path
+          if not config.key_name
+            # If we're using the default keypair, then show a warning
+            default_key_path = Vagrant.source_root.join("keys/vagrant.pub").to_s
+            public_key_path  = File.expand_path(config.public_key_path, env[:root_path])
+
+            if default_key_path == public_key_path
+              env[:ui].warn(I18n.t("vagrant_rackspace.warn_insecure_ssh"))
+            end
           end
 
           # Output the settings we're going to use to the user
@@ -52,14 +55,21 @@ module VagrantPlugins
           options = {
             :flavor_id   => flavor.id,
             :image_id    => image.id,
-            :name        => server_name,
-            :personality => [
+            :name        => server_name
+          }
+
+          if config.key_name
+            options[:keypair] = config.key_name
+            env[:ui].info(" -- Key Name: #{config.key_name}")
+          else
+            options[:personality] = [
               {
                 :path     => "/root/.ssh/authorized_keys",
                 :contents => Base64.encode64(File.read(public_key_path))
               }
             ]
-          }
+          end
+
           options[:disk_config] = config.disk_config if config.disk_config
           options[:networks] = config.networks if config.networks
 

data/lib/vagrant-rackspace/action/sync_folders.rb

@@ -48,7 +48,7 @@ module VagrantPlugins
               "rsync", "--verbose", "--archive", "-z",
               "--cvs-exclude", 
               "--exclude", ".hg/",
-              "-e", "ssh -p #{ssh_info[:port]} -i '#{ssh_info[:private_key_path]}' -o StrictHostKeyChecking=no",
+              "-e", "ssh -p #{ssh_info[:port]} -o StrictHostKeyChecking=no #{ssh_key_options(ssh_info)}",
               hostpath,
               "#{ssh_info[:username]}@#{ssh_info[:host]}:#{guestpath}"]
 
@@ -71,6 +71,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-rackspace/action.rb

@@ -76,6 +76,20 @@ module VagrantPlugins
         end
       end
 
+      def self.action_ssh_run
+        Vagrant::Action::Builder.new.tap do |b|
+          b.use ConfigValidate
+          b.use Call, IsCreated do |env, b2|
+            if !env[:result]
+              b2.use MessageNotCreated
+              next
+            end
+
+            b2.use SSHRun
+          end
+        end
+      end
+
       def self.action_up
         Vagrant::Action::Builder.new.tap do |b|
           b.use ConfigValidate
@@ -88,7 +102,6 @@ module VagrantPlugins
             b2.use ConnectRackspace
             b2.use Provision
             b2.use SyncFolders
-            b2.use WarnNetworks
             b2.use CreateServer
           end
         end
@@ -105,7 +118,6 @@ module VagrantPlugins
       autoload :ReadSSHInfo, action_root.join("read_ssh_info")
       autoload :ReadState, action_root.join("read_state")
       autoload :SyncFolders, action_root.join("sync_folders")
-      autoload :WarnNetworks, action_root.join("warn_networks")
     end
   end
 end

data/lib/vagrant-rackspace/config.rb

@@ -22,7 +22,7 @@ module VagrantPlugins
       # to DFW.
       # (formerly know as 'endpoint')
       #
-      # expected to be a string url - 
+      # expected to be a string url -
       # 'https://dfw.servers.api.rackspacecloud.com/v2'
       # 'https://ord.servers.api.rackspacecloud.com/v2'
       # 'https://lon.servers.api.rackspacecloud.com/v2'
@@ -54,6 +54,12 @@ module VagrantPlugins
       # @return [String]
       attr_accessor :public_key_path
 
+      # Alternately, if a keypair were already uploaded to Rackspace,
+      # the key name could be provided.
+      #
+      # @return [String]
+      attr_accessor :key_name
+
       # The option that indicates RackConnect usage or not.
       #
       # @return [Boolean]
@@ -154,10 +160,11 @@ module VagrantPlugins
       end
 
       def validate(machine)
-        errors = []
+        errors = _detected_errors
 
         errors << I18n.t("vagrant_rackspace.config.api_key_required") if !@api_key
         errors << I18n.t("vagrant_rackspace.config.username_required") if !@username
+        errors << I18n.t("one of vagrant.rackspace.config.key_name or vagrant.rackspace.config.public_key_path required") if !@key_name && !@public_key_path
 
         {
           :rackspace_compute_url => @rackspace_compute_url,
@@ -166,9 +173,11 @@ module VagrantPlugins
           errors << I18n.t("vagrant_rackspace.config.invalid_uri", :key => key, :uri => value) unless value.nil? || valid_uri?(value)
         end
 
-        public_key_path = File.expand_path(@public_key_path, machine.env.root_path)
-        if !File.file?(public_key_path)
-          errors << I18n.t("vagrant_rackspace.config.public_key_not_found")
+        if !@key_name
+          public_key_path = File.expand_path(@public_key_path, machine.env.root_path)
+          if !File.file?(public_key_path)
+            errors << I18n.t("vagrant_rackspace.config.public_key_not_found")
+          end
         end
 
         { "RackSpace Provider" => errors }

data/lib/vagrant-rackspace/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module Rackspace
-    VERSION = "0.1.4"
+    VERSION = "0.1.5"
   end
 end

data/spec/vagrant-rackspace/config_spec.rb

@@ -81,6 +81,16 @@ describe VagrantPlugins::Rackspace::Config do
       end
     end
 
+    context "with invalid key" do
+      it "should raise an error" do
+        subject.nonsense1 = true
+        subject.nonsense2 = false
+        I18n.should_receive(:t).with('vagrant.config.common.bad_field',
+          { :fields => 'nonsense1, nonsense2' })
+        .and_return error_message
+        validation_errors.first.should == error_message
+      end
+    end
     context "with good values" do
       it "should validate" do
         validation_errors.should be_empty

data/vagrant-rackspace.gemspec

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-rackspace
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Mitchell Hashimoto
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-15 00:00:00.000000000 Z
+date: 2014-01-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.15.0
+        version: '1.19'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.15.0
+        version: '1.19'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -75,6 +75,7 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - .travis.yml
+- Appraisals
 - CHANGELOG.md
 - Gemfile
 - LICENSE.txt
@@ -90,6 +91,9 @@ files:
 - features/support/env.rb
 - features/support/fog_mock.rb
 - features/vagrant-rackspace.feature
+- gemfiles/latest_stable.gemfile
+- gemfiles/oldest_current.gemfile
+- gemfiles/previous_release.gemfile
 - lib/vagrant-rackspace.rb
 - lib/vagrant-rackspace/action.rb
 - lib/vagrant-rackspace/action/connect_rackspace.rb
@@ -101,7 +105,6 @@ files:
 - lib/vagrant-rackspace/action/read_ssh_info.rb
 - lib/vagrant-rackspace/action/read_state.rb
 - lib/vagrant-rackspace/action/sync_folders.rb
-- lib/vagrant-rackspace/action/warn_networks.rb
 - lib/vagrant-rackspace/config.rb
 - lib/vagrant-rackspace/errors.rb
 - lib/vagrant-rackspace/plugin.rb

data/lib/vagrant-rackspace/action/warn_networks.rb

@@ -1,19 +0,0 @@
-module VagrantPlugins
-  module Rackspace
-    module Action
-      class WarnNetworks
-        def initialize(app, env)
-          @app = app
-        end
-
-        def call(env)
-          if env[:machine].config.vm.networks.length > 0
-            env[:ui].warn(I18n.t("vagrant_rackspace.warn_networks"))
-          end
-
-          @app.call(env)
-        end
-      end
-    end
-  end
-end