|
From d5e2b3bf0b437537e70ec3652223d73c80de8c48 Mon Sep 17 00:00:00 2001
|
|
From: Dominic Cleal <dcleal@redhat.com>
|
|
Date: Wed, 19 Nov 2014 10:35:43 +0000
|
|
Subject: [PATCH 04/12] Remove fog-softlayer dependency
|
|
|
|
---
|
|
lib/fog.rb | 1 -
|
|
lib/fog/bin.rb | 1 -
|
|
lib/fog/bin/softlayer.rb | 53 ------------------------------------------------
|
|
3 files changed, 55 deletions(-)
|
|
|
|
diff --git a/lib/fog.rb b/lib/fog.rb
|
|
index 3ffe05a..d719bc3 100644
|
|
--- a/lib/fog.rb
|
|
+++ b/lib/fog.rb
|
|
@@ -50,7 +50,6 @@ require 'fog/openstack'
|
|
require 'fog/ovirt'
|
|
require 'fog/profitbricks'
|
|
require 'fog/serverlove'
|
|
-require 'fog/softlayer'
|
|
require 'fog/storm_on_demand'
|
|
require 'fog/terremark'
|
|
require 'fog/vcloud'
|
|
diff --git a/lib/fog/bin.rb b/lib/fog/bin.rb
|
|
index 300b8f8..0b4758d 100644
|
|
--- a/lib/fog/bin.rb
|
|
+++ b/lib/fog/bin.rb
|
|
@@ -82,7 +82,6 @@ require 'fog/bin/openstack'
|
|
require 'fog/bin/ovirt'
|
|
require 'fog/bin/profitbricks'
|
|
require 'fog/bin/serverlove'
|
|
-require 'fog/bin/softlayer'
|
|
require 'fog/bin/storm_on_demand'
|
|
require 'fog/bin/terremark'
|
|
require 'fog/bin/vcloud'
|
|
diff --git a/lib/fog/bin/softlayer.rb b/lib/fog/bin/softlayer.rb
|
|
index 7195394..e69de29 100644
|
|
--- a/lib/fog/bin/softlayer.rb
|
|
+++ b/lib/fog/bin/softlayer.rb
|
|
@@ -1,53 +0,0 @@
|
|
-#
|
|
-# Author:: Matt Eldridge (<matt.eldridge@us.ibm.com>)
|
|
-# © Copyright IBM Corporation 2014.
|
|
-#
|
|
-# LICENSE: MIT (http://opensource.org/licenses/MIT)
|
|
-#
|
|
-
|
|
-class Softlayer < Fog::Bin
|
|
- class << self
|
|
- def class_for(key)
|
|
- case key
|
|
- when :compute
|
|
- Fog::Compute::Softlayer
|
|
- when :dns
|
|
- Fog::DNS::Softlayer
|
|
- when :network
|
|
- Fog::Network::Softlayer
|
|
- when :storage
|
|
- Fog::Storage::Softlayer
|
|
- else
|
|
- # @todo Replace most instances of ArgumentError with NotImplementedError
|
|
- # @todo For a list of widely supported Exceptions, see:
|
|
- # => http://www.zenspider.com/Languages/Ruby/QuickRef.html#35
|
|
- raise ArgumentError, "Unsupported #{self} service: #{key}"
|
|
- end
|
|
- end
|
|
-
|
|
- def [](service)
|
|
- @@connections ||= Hash.new do |hash, key|
|
|
- hash[key] = case key
|
|
- when :compute
|
|
- Fog::Logger.warning("Softlayer[:compute] is not recommended, use Compute[:aws] for portability")
|
|
- Fog::Compute.new(:provider => :softlayer)
|
|
- when :dns
|
|
- Fog::Logger.warning("Softlayer[:dns] is not recommended, use DNS[:aws] for portability")
|
|
- Fog::DNS.new(:provider => :softlayer)
|
|
- when :network
|
|
- Fog::Network.new(:provider => :softlayer)
|
|
- when :storage
|
|
- Fog::Storage.new(:provider => :softlayer)
|
|
- else
|
|
- raise ArgumentError, "Unrecognized service: #{key.inspect}"
|
|
- end
|
|
- end
|
|
- @@connections[service]
|
|
- end
|
|
-
|
|
- def services
|
|
- Fog::Softlayer.services
|
|
- end
|
|
- end
|
|
-end
|
|
-
|
|
--
|
|
2.1.0
|
|
|
