lib/fog/compute/rackspace.rb in fog-0.7.0 vs lib/fog/compute/rackspace.rb in fog-0.7.1

@@ -1,11 +1,11 @@
 module Fog
   module Rackspace
     class Compute < Fog::Service
 
       requires :rackspace_api_key, :rackspace_username
-      recognizes :rackspace_auth_url, :persistent
+      recognizes :rackspace_auth_url, :rackspace_servicenet, :persistent
       recognizes :provider # remove post deprecation
 
       model_path 'fog/compute/models/rackspace'
       model       :flavor
       collection  :flavors
@@ -60,11 +60,11 @@
             warning << " [light_black](" << location << ")[/] "
             Formatador.display_line(warning)
           end
 
           @rackspace_username = options[:rackspace_username]
-          reset_data
+          @data = self.class.data[@rackspace_username]
         end
 
         def reset_data
           self.class.data.delete(@rackspace_username)
           @data = self.class.data[@rackspace_username]
@@ -84,11 +84,13 @@
 
           require 'json'
           @rackspace_api_key = options[:rackspace_api_key]
           @rackspace_username = options[:rackspace_username]
           @rackspace_auth_url = options[:rackspace_auth_url]
+          @rackspace_servicenet = options[:rackspace_servicenet]
           authenticate
+          Excon.ssl_verify_peer = false if options[:rackspace_servicenet] == true
           @connection = Fog::Connection.new("#{@scheme}://#{@host}:#{@port}", options[:persistent])
         end
 
         def reload
           @connection.reset
@@ -135,10 +137,10 @@
             :rackspace_auth_url => @rackspace_auth_url
           }
           credentials = Fog::Rackspace.authenticate(options)
           @auth_token = credentials['X-Auth-Token']
           uri = URI.parse(credentials['X-Server-Management-Url'])
-          @host   = uri.host
+          @host   = @rackspace_servicenet == true ? "snet-#{uri.host}" : uri.host
           @path   = uri.path
           @port   = uri.port
           @scheme = uri.scheme
         end