vagrant-rackspace 0.1.2 → 0.1.3

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZThhZmFmOTgyYjFhYmJjZGQzYjBmMTU2OGIwNGEwODg0OGMxOTk3YQ==
+    MzA0YzJmYjA0ZTg4OTU4YmJjOWU3ZjMwNTU1YzNkYWM4NDA2OTI3MA==
   data.tar.gz: !binary |-
-    MmNkY2MzYWU1MzJlYzEyNjAwODc3YmRhYzQ3MjBmMGEwNTAzZjYzMQ==
+    YjE5MDEyNGQ3NmZiZjg2NTVjYWVhOGI3MGE4YTkzODFjMjJjODE0MA==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    YjU2MmM5NGU3MmU1ZjZiMWU4N2JhYjAzNDkyOWZhNjE4ODA2Y2ViZmQ2NDM3
-    YjcwZTRmZmI5NTg1MWQ2MzJhMjYwYWI2YjRhMjU4MWI1YWFhMWIwNzBkNDhm
-    NWFjNmJhZDgzODk2MjJiN2VjMzlmYmE2ZGVjMDIwYTAwMmUzN2M=
+    NmJiZTg2MDJkNTBlNjRjMDc2NjE3ZjZiOTg0N2MwZTUwN2VhYWZjYzY0M2Fl
+    ODQxNzRkNjNjOWZkOTNhOTVlNzM1NmJmNzFlOTUzZTAxNzhhZTMwMTQ4YjE2
+    OTc0YWViN2EyODc1NjcyMDBjOTIyOWM5ZDMzNTNlZWFkYjliMDI=
   data.tar.gz: !binary |-
-    NjkxMzcwOGVjODFiYTNhNjViODA0NGUwZWI2ODYwZGQwY2MyNzgzYjY0YmQz
-    MmRkMjQyMjk0ODc0NzAzYWI2NzE3OTM1ZTcyODExZDg0OWFkYzU3ZjcwM2Fj
-    Yjc0MDM3NjczYWExZDUyMGNjMDA4YTFjMTI0NTUxY2Q0OTM2YWM=
+    Y2FiMjc4OGQ1YTA3YzY3NTQ4M2Y4ZTc3N2YyOTA4ODFmYTRjY2ZlMDkxN2M4
+    OGNiZmY1ZTQ2ODZjYjYxODQzNmQyMWQzMmNkMjg2YmI1MDQwMDNhMmI0Yzhl
+    NjMwZTM4ODRmYmYwMmQ5MTk2ZmY4OTRjMTVkNzFmYzQ4MjJmNjg=

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+# 0.1.3 (September 6, 2013)
+
+
+IMPROVEMENTS:
+
+  - Adds ability to specify authentication endpoint; Support for UK Cloud! [GH-32]
+  - Adds ability to specify disk configuration (disk_conf) [GH-33]
+
 # 0.1.2 (August 22, 2013)
 
 FEATURES:

data/README.md

@@ -91,9 +91,11 @@ This provider exposes quite a few provider-specific configuration options:
   exact ID or name of the image, or this can be a regular expression to
   partially match some image.
 * `rackspace_region` - The region to hit. By default this is :dfw. Valid options are: 
-:dfw, :ord, :lon.  User this OR rackspace_compute_url
+:dfw, :ord, :lon, :iad, :syd.  Users should preference using this setting over `rackspace_compute_url` setting.
 * `rackspace_compute_url` - The compute_url to hit. This is good for custom endpoints. 
-Use this OR rackspace_region.
+* `rackspace_auth_url` - The endpoint to authentication against. By default, vagrant will use the global
+rackspace authentication endpoint for all regions with the exception of :lon. IF :lon region is specified
+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.
@@ -101,6 +103,7 @@ Use this OR rackspace_region.
   defaults to the name of the Vagrant machine (via `config.vm.define`), but
   can be overridden with this.
 * `username` - The username with which to access Rackspace.
+* `disk_config` - Disk Configuration  'AUTO' or 'MANUAL'
 
 These can be set like typical provider-specific configuration:
 

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

@@ -19,25 +19,23 @@ module VagrantPlugins
           api_key  = config.api_key
           username = config.username
 
-	  if config.rackspace_compute_url.nil? then
-	    @logger.info("Connecting to Rackspace region...")
-	    env[:rackspace_compute] = Fog::Compute.new({
-	      :provider => :rackspace,
-	      :version  => :v2,
-	      :rackspace_api_key => api_key,
-	      :rackspace_region => config.rackspace_region,
-	      :rackspace_username => username
-	    })
+          params = {
+            :provider => :rackspace,
+            :version  => :v2,
+            :rackspace_api_key => api_key,
+            :rackspace_username => username,
+            :rackspace_auth_url => config.rackspace_auth_url
+          }
+
+          if config.rackspace_compute_url
+            @logger.info("Connecting to Rackspace compute_url...")
+            params[:rackspace_compute_url] = config.rackspace_compute_url
           else
-	    @logger.info("Connecting to Rackspace compute_url...")
-	    env[:rackspace_compute] = Fog::Compute.new({
-	      :provider => :rackspace,
-	      :version  => :v2,
-	      :rackspace_api_key => api_key,
-	      :rackspace_compute_url => config.rackspace_compute_url,
-	      :rackspace_username => username
-	    })
-	  end
+            @logger.info("Connecting to Rackspace region...")
+            params[:rackspace_region] = config.rackspace_region
+          end
+
+          env[:rackspace_compute] = Fog::Compute.new params
 
           @app.call(env)
         end

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

@@ -44,6 +44,7 @@ module VagrantPlugins
           env[:ui].info(I18n.t("vagrant_rackspace.launching_server"))
           env[:ui].info(" -- Flavor: #{flavor.name}")
           env[:ui].info(" -- Image: #{image.name}")
+          env[:ui].info(" -- Disk Config: #{config.disk_config}") if config.disk_config
           env[:ui].info(" -- Name: #{server_name}")
 
           # Build the options for launching...
@@ -58,6 +59,7 @@ module VagrantPlugins
               }
             ]
           }
+          options[:disk_config] = config.disk_config if config.disk_config
 
           # Create the server
           server = env[:rackspace_compute].servers.create(options)

data/lib/vagrant-rackspace/config.rb

@@ -1,4 +1,5 @@
 require "vagrant"
+require "fog"
 
 module VagrantPlugins
   module Rackspace
@@ -14,7 +15,7 @@ module VagrantPlugins
       #
       # expected to be a symbol - :dfw (default), :ord, :lon
       #
-      # use this OR rackspace_compute_url
+      # Users should preference the rackspace_region setting over rackspace_compute_url
       attr_accessor :rackspace_region
 
       # The compute_url to access RackSpace. If nil, it will default
@@ -31,9 +32,14 @@ module VagrantPlugins
       # Fog::Compute::RackspaceV2::ORD_ENDPOINT
       # Fog::Compute::RackspaceV2::LON_ENDPOINT
       #
-      # use this OR rackspace_region
+      # Users should preference the rackspace_region setting over rackspace_compute_url
       attr_accessor :rackspace_compute_url
 
+      # The authenication endpoint. This defaults to Rackspace's global authentication endpoint.
+      # Users of the London data center should specify the following:
+      # https://lon.identity.api.rackspacecloud.com/v2.0
+      attr_writer :rackspace_auth_url
+
       # The flavor of server to launch, either the ID or name. This
       # can also be a regular expression to partially match a name.
       attr_accessor :flavor
@@ -63,33 +69,59 @@ module VagrantPlugins
       # @return [String]
       attr_accessor :username
 
+       # The disk configuration value.
+       #   * AUTO -   The server is built with a single partition the size of the target flavor disk. The file system is automatically adjusted to fit the entire partition.
+       #              This keeps things simple and automated. AUTO is valid only for images and servers with a single partition that use the EXT3 file system.
+       #              This is the default setting for applicable Rackspace base images.
+       #
+       #   * MANUAL - The server is built using whatever partition scheme and file system is in the source image. If the target flavor disk is larger,
+       #              the remaining disk space is left unpartitioned. This enables images to have non-EXT3 file systems, multiple partitions,
+       #              and so on, and enables you to manage the disk configuration.
+       #
+       # This defaults to MANUAL
+      attr_accessor :disk_config
+
       def initialize
         @api_key  = UNSET_VALUE
         @rackspace_region = UNSET_VALUE
         @rackspace_compute_url = UNSET_VALUE
+        @rackspace_auth_url = UNSET_VALUE
         @flavor   = UNSET_VALUE
         @image    = UNSET_VALUE
         @public_key_path = UNSET_VALUE
         @rackconnect = UNSET_VALUE
         @server_name = UNSET_VALUE
         @username = UNSET_VALUE
+        @disk_config = UNSET_VALUE
       end
 
       def finalize!
         @api_key  = nil if @api_key == UNSET_VALUE
         @rackspace_region = nil if @rackspace_region == UNSET_VALUE
         @rackspace_compute_url = nil if @rackspace_compute_url == UNSET_VALUE
+        @rackspace_auth_url = nil if @rackspace_auth_url == UNSET_VALUE
         @flavor   = /512MB/ if @flavor == UNSET_VALUE
         @image    = /Ubuntu/ if @image == UNSET_VALUE
-        @rackconnect = false if @rackconnect == UNSET_VALUE
+        @rackconnect = nil if @rackconnect == UNSET_VALUE
         @server_name = nil if @server_name == UNSET_VALUE
         @username = nil if @username == UNSET_VALUE
+        @disk_config = nil if @disk_config == UNSET_VALUE
 
         if @public_key_path == UNSET_VALUE
           @public_key_path = Vagrant.source_root.join("keys/vagrant.pub")
         end
       end
 
+      # @note Currently, you must authenticate against the UK authenication endpoint to access the London Data center.
+      #     Hopefully this method makes the experience more seemless for users of the UK cloud.
+      def rackspace_auth_url
+        if (@rackspace_auth_url.nil? || @rackspace_auth_url == UNSET_VALUE) && lon_region?
+          Fog::Rackspace::UK_AUTH_ENDPOINT
+        else
+          @rackspace_auth_url
+        end
+      end
+
       def validate(machine)
         errors = []
 
@@ -103,6 +135,12 @@ module VagrantPlugins
 
         { "RackSpace Provider" => errors }
       end
+
+      private
+
+      def lon_region?
+        rackspace_region && rackspace_region != UNSET_VALUE && rackspace_region.to_sym == :lon
+      end
     end
   end
 end

data/lib/vagrant-rackspace/version.rb

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

data/spec/vagrant-rackspace/config_spec.rb

@@ -1,4 +1,5 @@
 require "vagrant-rackspace/config"
+require 'fog'
 
 describe VagrantPlugins::Rackspace::Config do
   describe "defaults" do
@@ -13,23 +14,27 @@ describe VagrantPlugins::Rackspace::Config do
     its(:api_key)  { should be_nil }
     its(:rackspace_region) { should be_nil }
     its(:rackspace_compute_url) { should be_nil }
+    its(:rackspace_auth_url) { should be_nil }
     its(:flavor)   { should eq(/512MB/) }
     its(:image)    { should eq(/Ubuntu/) }
     its(:public_key_path) { should eql(vagrant_public_key) }
     its(:rackconnect) { should be_nil }
     its(:server_name) { should be_nil }
     its(:username) { should be_nil }
+    its(:disk_config) { should be_nil }
   end
 
   describe "overriding defaults" do
     [:api_key,
       :rackspace_region,
       :rackspace_compute_url,
+      :rackspace_auth_url,
       :flavor,
       :image,
       :public_key_path,
       :rackconnect,
       :server_name,
+      :disk_config,
       :username].each do |attribute|
       it "should not default #{attribute} if overridden" do
         subject.send("#{attribute}=".to_sym, "foo")
@@ -66,4 +71,53 @@ describe VagrantPlugins::Rackspace::Config do
       it "should error if not given"
     end
   end
+
+  describe "rackspace_auth_url" do
+    it "should return UNSET_VALUE if rackspace_auth_url and rackspace_region are UNSET" do
+      subject.rackspace_auth_url.should == VagrantPlugins::Rackspace::Config::UNSET_VALUE
+    end
+    it "should return UNSET_VALUE if rackspace_auth_url is UNSET and rackspace_region is :ord" do
+      subject.rackspace_region = :ord
+      subject.rackspace_auth_url.should == VagrantPlugins::Rackspace::Config::UNSET_VALUE
+    end
+    it "should return UK Authentication endpoint if rackspace_auth_url is UNSET and rackspace_region is :lon" do
+      subject.rackspace_region = :lon
+      subject.rackspace_auth_url.should == Fog::Rackspace::UK_AUTH_ENDPOINT
+    end
+    it "should return custom endpoint if supplied and rackspace_region is :lon" do
+      my_endpoint = 'http://custom-endpoint.com'
+      subject.rackspace_region = :lon
+      subject.rackspace_auth_url = my_endpoint
+      subject.rackspace_auth_url.should == my_endpoint
+    end
+    it "should return custom endpoint if supplied and rackspace_region is UNSET" do
+      my_endpoint = 'http://custom-endpoint.com'
+      subject.rackspace_auth_url = my_endpoint
+      subject.rackspace_auth_url.should == my_endpoint
+    end
+  end
+
+
+  describe "lon_region?" do
+    it "should return false if rackspace_region is UNSET_VALUE" do
+      subject.rackspace_region = VagrantPlugins::Rackspace::Config::UNSET_VALUE
+      subject.send(:lon_region?).should be_false
+    end
+    it "should return false if rackspace_region is nil" do
+      subject.rackspace_region = nil
+      subject.send(:lon_region?).should be_false
+    end
+    it "should return false if rackspace_region is :ord" do
+      subject.rackspace_region = :ord
+      subject.send(:lon_region?).should be_false
+    end
+    it "should return true if rackspace_region is 'lon'" do
+      subject.rackspace_region = 'lon'
+      subject.send(:lon_region?).should be_true
+    end
+    it "should return true if rackspace_Region is :lon" do
+      subject.rackspace_region = :lon
+      subject.send(:lon_region?).should be_true
+    end
+  end
 end

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.10.0"
+  gem.add_runtime_dependency "fog", "~> 1.15.0"
 
   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.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Mitchell Hashimoto
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-22 00:00:00.000000000 Z
+date: 2013-09-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.10.0
+        version: 1.15.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.10.0
+        version: 1.15.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement