Merge pull request #24 from cdwilhelm/curt-dev

Use RL10 proxy instead of instance token

libraries/provider_rightscale_volume.rb

@@ -276,13 +276,11 @@ def initialize_api_client(options = {})
         # Require gems in initialize
         require "right_api_client"
 
-        require "/var/spool/cloud/user-data.rb"
-        account_id, instance_token = ENV["RS_API_TOKEN"].split(":")
-        api_url = "https://#{ENV["RS_SERVER"]}"
+        #require "/var/spool/cloud/user-data.rb"
+        #account_id, instance_token = ENV["RS_API_TOKEN"].split(":")
+        #api_url = "https://#{ENV["RS_SERVER"]}"
         options = {
-          :account_id => account_id,
-          :instance_token => instance_token,
-          :api_url => api_url,
+          :rl10 => true,
           :timeout => 20 * 60,
         }.merge options
 

metadata.rb

@@ -4,8 +4,7 @@
 license          'Apache 2.0'
 description      'Provides a resource to manage volumes on any cloud RightScale supports.'
 long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
-version          '1.2.10'
+version          '1.3.0'
 
 depends 'build-essential'
-
 recipe "rightscale_volume::default", "Default recipe for installing required packages/gems."