vagrant-rackspace 0.1.8 → 0.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7324f904ffa180128b4c16db1c61a2ca9aa86ba8
-  data.tar.gz: 83d9122d95c830e14093e988fbc72329aa14e6a2
+  metadata.gz: c154b6d9ba1e6a974a32630ee8772c5fc85ec9d1
+  data.tar.gz: 74eb7ba525a976cda9b66a2509200b5581ecaf7b
 SHA512:
-  metadata.gz: d6e0ffe9c336faa5cb93752b42a2d73aabc67ff8f728128eac860d0e1100090fc53a9c0219aa9f8ef1986103b1473155f96a9c8fb2fafb96aa5e18f3ca128999
-  data.tar.gz: 2420f4a7ff9decf897cecd34501ec39e713d84731f342ac464552ad5dd9888c5f14c7b8822ee6b3ea63f637b15def31fe72bf5e43dddcb056de68041d6f97bee
+  metadata.gz: 33ce385cd1ec29e0d141f8cbbd0ae84d0907c6f35ef698071bd9653e86a902dac0273b732d23ebb7b03b8dc5fdbf72c31d742244ef93e7b336ba322d0ac07bd8
+  data.tar.gz: 52a4d2b9a4bee5d33c3dca0ce1bf426ddebd567c65bbfe1078f163e3134d39a6847377031dcca20bdf806a038da0cbf7f85eb407460a12d4437b9087c8969bc7

data/CHANGELOG.md

@@ -1,8 +1,19 @@
-# 0.1.8 (June 20, 2014)
+# 0.1.9 (June 24, 2014)
 
 FEATURES:
 
+ - Support for userdata and drive config [GH-100]
+
+ BUG FIXES:
+
+ - Fixed the ability to specify strings and integers for flavors and images in VagrantFile
  
+# 0.1.8 (June 20, 2014)
+
+FEATURES:
+
+ - Use new synced folder support found in Vagrant 1.4+ if available [GH-104]
+ - Ability to set admin password [GH-105] [GH-107]
 
 IMPROVEMENTS:
 

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

@@ -63,6 +63,14 @@ module VagrantPlugins
             options[:password] = config.admin_password
           end
 
+          if config.user_data
+            options[:user_data] = File.read(config.user_data)
+          end
+
+          if config.config_drive
+            options[:config_drive] = config.config_drive
+          end
+
           if config.key_name
             options[:key_name] = config.key_name
             env[:ui].info(" -- Key Name: #{config.key_name}")
@@ -140,17 +148,33 @@ module VagrantPlugins
 
         protected
 
+        def escape_name_if_necessary(name)
+          # The next release of fog should url escape these values.
+          return name if Gem::Version.new(Fog::VERSION) > Gem::Version.new("1.22.1")
+
+          Fog::Rackspace.escape(name)
+        end
+
         # This method finds a matching _thing_ in a collection of
         # _things_. This works matching if the ID or NAME equals to
         # `name`. Or, if `name` is a regexp, a partial match is chosen
         # as well.
         def find_matching(collection, name)
-          if name.is_a?(Regexp)
-            collection.all.find {|item| name =~ item.name }
-          else
-            collection.get name
+          item = collection.find do |single|
+            single.id == name ||
+            single.name == name ||
+            (name.is_a?(Regexp) && name =~ single.name)
+          end
+
+          # If it is not present in collection, it might be a non-standard image/flavor
+          if item.nil? && !name.is_a?(Regexp)
+            item = collection.get escape_name_if_necessary(name)
           end
+
+          item
         end
+
+
       end
     end
   end

data/lib/vagrant-rackspace/config.rb

@@ -60,6 +60,16 @@ module VagrantPlugins
       # @return [String]
       attr_accessor :key_name
 
+      # The path to the file containing user data for cloud init
+      #
+      # @ return [String]
+      attr_accessor :user_data
+
+      # Whether to attach a read-only configuration drive
+      #
+      # @ return [Boolean]
+      attr_accessor :config_drive
+
       # A Hash of metadata that will be sent to the instance for configuration
       #
       # @return [Hash]
@@ -123,6 +133,8 @@ module VagrantPlugins
         @public_key_path = UNSET_VALUE
         @rackconnect = UNSET_VALUE
         @server_name = UNSET_VALUE
+        @user_data = UNSET_VALUE
+        @config_drive = UNSET_VALUE
         @username = UNSET_VALUE
         @disk_config = UNSET_VALUE
         @networks = []
@@ -138,6 +150,8 @@ module VagrantPlugins
         @image    = /Ubuntu/ if @image == UNSET_VALUE
         @rackconnect = nil if @rackconnect == UNSET_VALUE
         @server_name = nil if @server_name == UNSET_VALUE
+        @user_data = nil if @user_data == UNSET_VALUE
+        @config_drive = nil if @config_drive == UNSET_VALUE
         @metadata = nil if @metadata == UNSET_VALUE
         @username = nil if @username == UNSET_VALUE
         @disk_config = nil if @disk_config == UNSET_VALUE

data/lib/vagrant-rackspace/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module Rackspace
-    VERSION = "0.1.8"
+    VERSION = "0.1.9"
   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.18"
+  gem.add_runtime_dependency "fog", "~> 1.22"
 
   gem.add_development_dependency "rake"
   gem.add_development_dependency "rspec", "~> 2.14.0"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-rackspace
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.1.9
 platform: ruby
 authors:
 - Mitchell Hashimoto
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-20 00:00:00.000000000 Z
+date: 2014-06-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.18'
+        version: '1.22'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.18'
+        version: '1.22'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement