|
From 5336edf5708809cb0ae6e8e6a64915914303f2cd Mon Sep 17 00:00:00 2001
|
|
From: Dominic Cleal <dcleal@redhat.com>
|
|
Date: Wed, 19 Nov 2014 10:33:34 +0000
|
|
Subject: [PATCH 01/14] Remove fog-brightbox dependency
|
|
|
|
---
|
|
lib/fog.rb | 1 -
|
|
lib/fog/bin.rb | 1 -
|
|
lib/fog/bin/brightbox.rb | 35 -----------------------------------
|
|
3 files changed, 37 deletions(-)
|
|
|
|
diff --git a/lib/fog.rb b/lib/fog.rb
|
|
index 3733b24..03bb827 100644
|
|
--- a/lib/fog.rb
|
|
+++ b/lib/fog.rb
|
|
@@ -22,7 +22,6 @@ require 'fog/core/deprecated_connection_accessors'
|
|
require 'fog/atmos'
|
|
require 'fog/aws'
|
|
require 'fog/bluebox'
|
|
-require 'fog/brightbox'
|
|
require 'fog/cloudstack'
|
|
require 'fog/clodo'
|
|
require 'fog/digitalocean'
|
|
diff --git a/lib/fog/bin.rb b/lib/fog/bin.rb
|
|
index 594c307..68fc7dd 100644
|
|
--- a/lib/fog/bin.rb
|
|
+++ b/lib/fog/bin.rb
|
|
@@ -54,7 +54,6 @@ end
|
|
require 'fog/bin/atmos'
|
|
require 'fog/bin/aws'
|
|
require 'fog/bin/bluebox'
|
|
-require 'fog/bin/brightbox'
|
|
require 'fog/bin/cloudstack'
|
|
require 'fog/bin/clodo'
|
|
require 'fog/bin/digitalocean'
|
|
diff --git a/lib/fog/bin/brightbox.rb b/lib/fog/bin/brightbox.rb
|
|
index 72b7f2f..e69de29 100644
|
|
--- a/lib/fog/bin/brightbox.rb
|
|
+++ b/lib/fog/bin/brightbox.rb
|
|
@@ -1,35 +0,0 @@
|
|
-class Brightbox < Fog::Bin
|
|
- class << self
|
|
- def class_for(key)
|
|
- case key
|
|
- when :compute
|
|
- Fog::Compute::Brightbox
|
|
- when :storage
|
|
- Fog::Storage::Brightbox
|
|
- else
|
|
- 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("Brightbox[:compute] is not recommended, use Compute[:brightbox] for portability")
|
|
- Fog::Compute.new(:provider => 'Brightbox')
|
|
- else
|
|
- raise ArgumentError, "Unrecognized service: #{key.inspect}"
|
|
- end
|
|
- end
|
|
- @@connections[service]
|
|
- end
|
|
-
|
|
- def account
|
|
- @@connections[:compute].account
|
|
- end
|
|
-
|
|
- def services
|
|
- Fog::Brightbox.services
|
|
- end
|
|
- end
|
|
-end
|
|
--
|
|
2.1.0
|
|
|
