[rackspace] updating compute and storage to pull service net urls from service catalog

lib/fog/rackspace/compute.rb

@@ -240,10 +240,7 @@ module Fog
 
          def endpoint_uri(service_endpoint_url=nil)
            return @uri if @uri
-
-           @uri = super(@rackspace_endpoint || service_endpoint_url, :rackspace_compute_v1_url)
-           @uri.host = "snet-#{@uri.host}" if service_net?
-           @uri
+           super(@rackspace_endpoint || service_endpoint_url, :rackspace_compute_v1_url)
          end
 
          private

lib/fog/rackspace/service.rb

@@ -52,6 +52,10 @@ module Fog
         response
       end
 
+      def service_net?
+        false
+      end
+
       private
 
       def process_response(response)
@@ -118,7 +122,7 @@ module Fog
       end
 
       def endpoint_uri_v2
-        @uri = @identity_service.service_catalog.get_endpoint(service_name, region)
+        @uri = @identity_service.service_catalog.get_endpoint(service_name, region, service_net?)
       end
 
       def auth_token

lib/fog/rackspace/storage.rb

@@ -190,10 +190,7 @@ module Fog
 
         def endpoint_uri(service_endpoint_url=nil)
           return @uri if @uri
-
-          @uri = super(@rackspace_storage_url || service_endpoint_url, :rackspace_storage_url)
-          @uri.host = "snet-#{@uri.host}" if service_net?
-          @uri
+          super(@rackspace_storage_url || service_endpoint_url, :rackspace_storage_url)
         end
 
         private