fog 1.27.0 → 1.28.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4a15d39677eecae6d623de5fd8458293158bed12
-  data.tar.gz: ab9d1bcd8ee755956c97747b739ea0a10e84fd43
+  metadata.gz: 3aa5a136d7d98de58ebd9860c1891362d1ef444f
+  data.tar.gz: e98e9f10aa44217d7c77f6dd0b4b8c77d4a25dfa
 SHA512:
-  metadata.gz: e3fea3a592c2789418b5e03c54935916055257dd0bdc0e6356853841b137ed3a4a345513e66e6bcf726cec8618ba0aaa4220e0fa74c5f24ca5d81ceb15e7aff0
-  data.tar.gz: 573e952db5240c598ba9803efcd1b4f2ea2cef6e2b8c9cdebfd3e2760476417f209ff81c463fcf6447f26e3d4f32d93e143cb2860faf526f23260b54bd9ab7c8
+  metadata.gz: d98bf176c48f72fc7201af9d50153ef42ad4b8409aef525b341e67e7367ef3e6222f7893220372e98e2b69b207ea21f19b18ea2c21f1d083cd25c2e0f72f20c1
+  data.tar.gz: 9b455f7ba0790da24d906a36247dc4f3c28d64cd2a8094b4433200bc0ffc7bc96ee45ff1c98871b210b412448475c52c1e2ddfaf6915bd2628be79914fc13d9c

data/CHANGELOG.md

@@ -1,3 +1,74 @@
+## 1.28.0 02/19/2015
+*Hash* d023ee520bcf52072f50f03e22efde344caef936
+
+Statistic     | Value
+------------- | --------:
+Collaborators | 2
+Downloads     | 8526269
+Forks         | 1402
+Open Issues   | 86
+Watchers      | 3382
+
+**MVP!** Peter Souter
+
+#### [HP|storage]
+*   Add support for headers to get_object. thanks Bruz Marzolf
+
+#### [Openstack|Servers|Create]
+*   Allow :volume_size in block_device_mapping_v2. thanks Brandon Dunne
+
+#### [google]
+*   Add support for JSON key format. thanks Ferran Rodenas
+
+#### [joyent|compute]
+*   support for gracefully handling 400 error responses from api Fixes #3434. thanks Kevin Chan
+
+#### [misc]
+*   Port Rackspace Orchestration implementation to OpenStack. thanks Bill Wei
+*   Pass options when get resources from a stack. thanks Bill Wei
+*   Add ubuntu-os-cloud to list of global projects. thanks Chris Gianelloni
+*   get resource pool without name. thanks Chris Thompson
+*   Add nic_type option. thanks Darren Foo
+*   Adding multiple server support for Docker. thanks David Davis
+*   Fixes "Error - undefined method 'delete' for nil:NilClass" when attempting to stop a container. thanks Dmitri Dolguikh
+*   Remove duplicate openstack_region key. thanks Kyle Tolle
+*   Add OpenStack Ironic support. thanks Ladislav Smola
+*   Ming Jin: added list/get compute_resource functions. thanks Ming Jin
+*   Ming Jin: expose effective attribute. thanks Ming Jin
+*   Ming Jin: add isSingleHost attribute to compute resource. thanks Ming Jin
+*   Ming Jin: fix nil usage issue of host. thanks Ming Jin
+*   Ming Jin: added appropriate mocked response. thanks Ming Jin
+*   Fix RDoc build. thanks Paulo Henrique Lopes Ribeiro
+*   Fix small typo. thanks Paulo Henrique Lopes Ribeiro
+*   Remove RiakCS. thanks Paulo Henrique Lopes Ribeiro
+*   Remove tests. thanks Paulo Henrique Lopes Ribeiro
+*   Remove unused credentials. thanks Paulo Henrique Lopes Ribeiro
+*   Remove Bin. thanks Paulo Henrique Lopes Ribeiro
+*   Add Fog::RiakCS as dependency. thanks Paulo Henrique Lopes Ribeiro
+*   Add floating disks manipulation in rbovirt provider. thanks Pavol Dilung
+*   Fix method names errors in exception. thanks Pavol Dilung
+*   Add missing braces. thanks Pavol Dilung
+*   Updates location to get API keys from. thanks Peter Souter
+*   Adds section about SSH key management. thanks Peter Souter
+*   Adds notes about how to bootstrap a server. thanks Peter Souter
+*   Fix typo. thanks Peter Souter
+*   Adds RDoc for #bootstrap, #get(id) and #all(). thanks Peter Souter
+*   Removes not about not being documented. thanks Peter Souter
+*   adding option to set ovirt to use filtered API. thanks Tom Caspy
+*   adding version attribute for ovirt template. thanks Tom Caspy
+*   Remove duplicate lines from code example. thanks Tomas Varaneckas
+*   Use correct variable in code example. thanks Tomas Varaneckas
+*   remove redundant requires. thanks geemus
+*   cloudinit to customspec support. thanks karmab
+*   Use Fog::Formatador. thanks starbelly
+
+#### [vsphere]
+*   new default dest_folder in vm_clone. thanks Chris Thompson
+*   find network by name and dvswitch. thanks Chris Thompson
+*   Supplied a mock implementation for cloudinit_to_customspec. thanks Kevin Menard
+*   searching for VM improved to search whole cluster instead of current folder. thanks Matthew Black
+
+
 ## 1.27.0 01/12/2015
 *Hash* 8a8f9a366be09de646536f06e2bcc84eb9229087
 

data/Rakefile

@@ -102,7 +102,7 @@ task :nuke do
     begin
       compute = Fog::Compute.new(:provider => provider)
       for server in compute.servers
-        Formatador.display_line("[#{provider}] destroying server #{server.identity}")
+        Fog::Formatador.display_line("[#{provider}] destroying server #{server.identity}")
         server.destroy rescue nil
       end
     rescue
@@ -113,7 +113,7 @@ task :nuke do
         for record in zone.records
           record.destroy rescue nil
         end
-        Formatador.display_line("[#{provider}] destroying zone #{zone.identity}")
+        Fog::Formatador.display_line("[#{provider}] destroying zone #{zone.identity}")
         zone.destroy rescue nil
       end
     rescue

data/bin/fog

@@ -63,8 +63,8 @@ else
     @irb.signal_handle
   end
 
-  Formatador.display_line('Welcome to fog interactive!')
-  Formatador.display_line(":#{Fog.credential} provides #{providers}")
+  Fog::Formatador.display_line('Welcome to fog interactive!')
+  Fog::Formatador.display_line(":#{Fog.credential} provides #{providers}")
   providers = Fog.providers
 
   # FIXME: hacks until we can `include Fog` in bin

data/fog.gemspec

@@ -11,8 +11,8 @@ Gem::Specification.new do |s|
   ## If your rubyforge_project name is different, then edit it and comment out
   ## the sub! line in the Rakefile
   s.name              = 'fog'
-  s.version           = '1.27.0'
-  s.date              = '2015-01-12'
+  s.version           = '1.28.0'
+  s.date              = '2015-02-19'
   s.rubyforge_project = 'fog'
 
   ## Make sure your summary is short. The description may be as long
@@ -67,6 +67,7 @@ Gem::Specification.new do |s|
   s.add_dependency("fog-storm_on_demand")
   s.add_dependency("fog-atmos")
   s.add_dependency("fog-serverlove")
+  s.add_dependency("fog-riakcs")
 
   # Disabled until Rackspace isn't broken, see fog-rackspace#10
   #s.add_dependency("fog-rackspace")
@@ -78,7 +79,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency('rbvmomi')
   s.add_development_dependency('yard')
   s.add_development_dependency('thor')
-  s.add_development_dependency('rbovirt', '0.0.31')
+  s.add_development_dependency('rbovirt', '0.0.32')
   s.add_development_dependency('shindo', '~> 0.3.4')
   s.add_development_dependency('fission')
   s.add_development_dependency('opennebula')

data/lib/fog/bin/clodo.rb

@@ -13,7 +13,7 @@ class Clodo < Fog::Bin
       @@connections ||= Hash.new do |hash, key|
         hash[key] = case key
         when :compute
-          Formatador.display_line("[yellow][WARN] Clodo[:compute] is deprecated, use Compute[:clodo] instead[/]")
+          Fog::Formatador.display_line("[yellow][WARN] Clodo[:compute] is deprecated, use Compute[:clodo] instead[/]")
           Fog::Compute.new(:provider => 'Clodo')
         else
           raise ArgumentError, "Unrecognized service: #{key.inspect}"

data/lib/fog/bin/openstack.rb

@@ -18,6 +18,8 @@ class OpenStack < Fog::Bin
         Fog::Metering::OpenStack
       when :orchestration
         Fog::Orchestration::OpenStack
+      when :baremetal
+        Fog::Baremetal::OpenStack
       else
         raise ArgumentError, "Unrecognized service: #{key}"
       end
@@ -50,6 +52,9 @@ class OpenStack < Fog::Bin
         when :orchestration
           Fog::Logger.warning("OpenStack[:orchestration] is not recommended, use Orchestration[:openstack] for portability")
           Fog::Orchestration.new(:provider => 'OpenStack')
+        when :baremetal
+          Fog::Logger.warning("OpenStack[:baremetal] is not recommended, use Baremetal[:openstack] for portability")
+          Fog::Baremetal.new(:provider => 'OpenStack')
         else
           raise ArgumentError, "Unrecognized service: #{key.inspect}"
         end

data/lib/fog/digitalocean/examples/getting_started.md

@@ -2,10 +2,7 @@
 
 You'll need a DigitalOcean account and API key to use this provider.
 
-Get one from http://www.digitalocean.com.
-
-To generate the API key, login to the DigitalOcean web panel and go to
-'My Settings -> API Access -> Generate a new API key'.
+Get one from https://cloud.digitalocean.com/api_access (fog currently uses the v1 API)
 
 Write down the Client Key and API Key, you'll need both to use the service.
 
@@ -29,6 +26,51 @@ docean = Fog::Compute.new({
 })
 ```
 
+## SSH Key Management
+
+Access to DigitalOcean servers can be managed with SSH keys. These can be assigned to servers at creation time so you can access them without having to use a password.
+
+Creating a key:
+
+```ruby
+docean.ssh_keys.create(
+  :name        => 'Default SSH Key',
+  :ssh_pub_key => File.read('~/.ssh/id_rsa.pub'))
+)
+```
+
+Listing all keys:
+
+```ruby
+docean.ssh_keys.each do | key |
+   key.name
+   key.ssh_pub_key
+end
+```
+
+Destroying a key:
+
+```ruby
+docean.ssh_keys.destroy(:id => '27100')
+```
+
+## Boostrapping a server
+
+Fog can be used to bootstrap a server, which will create an SSH key to be assigned to a server at boot.
+
+```ruby
+server = connection.servers.bootstrap({
+  :name => 'test',
+  :image_id => 1505447,
+  :size_id => 33,
+  :region_id => 4,
+  :flavor_id => 66,
+  :public_key_path => File.expand_path('~/.ssh/id_rsa.pub'),
+  :private_key_path => File.expand_path('~/.ssh/id_rsa'),
+})
+server.wait_for { ready? }
+```
+
 ## Listing servers
 
 Listing servers and attributes:

data/lib/fog/digitalocean/models/compute/server.rb

@@ -12,8 +12,6 @@ module Fog
         attribute :image_id
         attribute :region_id
         attribute :flavor_id, :aliases => 'size_id'
-        # Not documented in their API, but
-        # available nevertheless
         attribute :public_ip_address, :aliases => 'ip_address'
         attribute :private_ip_address
         attribute :private_networking
@@ -94,7 +92,7 @@ module Fog
             commands << %{echo "#{public_key}" >> ~/.ssh/authorized_keys}
           end
 
-          # wait for aws to be ready
+          # wait for DigitalOcean to be ready
           wait_for { sshable?(credentials) }
 
           Fog::SSH.new(ssh_ip_address, username, credentials).run(commands)

data/lib/fog/digitalocean/models/compute/servers.rb

@@ -7,11 +7,33 @@ module Fog
       class Servers < Fog::Collection
         model Fog::Compute::DigitalOcean::Server
 
+        # Returns list of servers
+        # @return [Fog::Compute::DigitalOcean::Servers] Retrieves a list of servers.
+        # @raise [Fog::Compute::DigitalOcean::NotFound] - HTTP 404
+        # @raise [Fog::Compute::DigitalOcean::BadRequest] - HTTP 400
+        # @raise [Fog::Compute::DigitalOcean::InternalServerError] - HTTP 500
+        # @raise [Fog::Compute::DigitalOcean::ServiceError]
+        # @see https://developers.digitalocean.com/v1/droplets/
         def all(filters = {})
           data = service.list_servers.body['droplets']
           load(data)
         end
 
+        # Creates a new server and populates ssh keys
+        #
+        # @return [Fog::Compute::DigitalOcean::Server]
+        # @raise [Fog::Compute::DigitalOcean::NotFound] - HTTP 404
+        # @raise [Fog::Compute::DigitalOcean::BadRequest] - HTTP 400
+        # @raise [Fog::Compute::DigitalOcean::InternalServerError] - HTTP 500
+        # @raise [Fog::Compute::DigitalOcean::ServiceError]
+        # @note This creates an SSH public key object and assigns it to the server on creation
+        # @example
+        #   service.servers.bootstrap :name => 'bootstrap-server',
+        #                             :flavor_ref => service.flavors.first.id,
+        #                             :image_ref => service.images.find {|img| img.name =~ /Ubuntu/}.id,
+        #                             :public_key_path => '~/.ssh/fog_rsa.pub',
+        #                             :private_key_path => '~/.ssh/fog_rsa'
+        #
         def bootstrap(new_attributes = {})
           server = new(new_attributes)
 
@@ -40,6 +62,14 @@ module Fog
           server
         end
 
+        # Retrieves server
+        # @param [String] id for server to be returned
+        # @return [Fog::Compute::DigitalOcean:Server]
+        # @raise [Fog::Compute::DigitalOcean::NotFound] - HTTP 404
+        # @raise [Fog::Compute::DigitalOcean::BadRequest] - HTTP 400
+        # @raise [Fog::Compute::DigitalOcean::InternalServerError] - HTTP 500
+        # @raise [Fog::Compute::DigitalOcean::ServiceError]
+        # @see https://developers.digitalocean.com/v1/droplets/
         def get(id)
           server = service.get_server_details(id).body['droplet']
           new(server) if server

data/lib/fog/fogdocker/compute.rb

@@ -40,8 +40,9 @@ module Fog
           email    = options[:docker_email]
           url      = options[:docker_url]
 
-          Docker.url = url
-          Docker.authenticate!('username' => username, 'password' => password, 'email' => email) unless username.nil? || username.empty?
+          connection_options = {:username => username, :password => password, :email => email}
+          @connection = Docker::Connection.new(url, connection_options)
+          Docker.authenticate!(connection_options, @connection) if username || email || password
         rescue Docker::Error::AuthenticationError => e
           raise Fog::Errors::Fogdocker::AuthenticationError.new(e.message)
         end

data/lib/fog/fogdocker/requests/compute/container_action.rb

@@ -5,7 +5,7 @@ module Fog
         def container_action(options = {})
           raise ArgumentError, "instance id is a required parameter" unless options.key? :id
           raise ArgumentError, "action is a required parameter" unless options.key? :action
-          result = Docker::Container.get(options[:id]).send(options[:action], options[:options])
+          result = Docker::Container.get(options[:id], {}, @connection).send(options[:action], options[:options] || {})
 
           if result.is_a?(Hash)
             downcase_hash_keys(result)

data/lib/fog/fogdocker/requests/compute/container_all.rb

@@ -9,7 +9,7 @@ module Fog
         # before – Show only containers created before Id, include non-running ones.
         # size – true or false, Show the containers sizes
         def container_all(filters = {})
-          Docker::Container.all(filters.merge(:all => true)).map do |container|
+          Docker::Container.all(filters.merge(:all => true), @connection).map do |container|
             downcase_hash_keys(container.json)
           end
         end

data/lib/fog/fogdocker/requests/compute/container_commit.rb

@@ -4,7 +4,7 @@ module Fog
       class Real
         def container_commit(options)
           raise ArgumentError, "instance id is a required parameter" unless options.key? :id
-          container = Docker::Container.get(options[:id])
+          container = Docker::Container.get(options[:id], {}, @connection)
           downcase_hash_keys container.commit(camelize_hash_keys(options)).json
         end
       end

data/lib/fog/fogdocker/requests/compute/container_create.rb

@@ -27,7 +27,7 @@ module Fog
       #}
       class Real
         def container_create(attrs)
-          downcase_hash_keys Docker::Container.create(camelize_hash_keys(attrs)).json
+          downcase_hash_keys Docker::Container.create(camelize_hash_keys(attrs), @connection).json
         end
       end
 

data/lib/fog/fogdocker/requests/compute/container_delete.rb

@@ -4,7 +4,7 @@ module Fog
       class Real
         def container_delete(options = {})
           raise ArgumentError, "instance id is a required parameter" unless options.key? :id
-          container = Docker::Container.get(options[:id])
+          container = Docker::Container.get(options[:id], {}, @connection)
           container.delete()
           true
         end

data/lib/fog/fogdocker/requests/compute/container_get.rb

@@ -3,7 +3,7 @@ module Fog
     class Fogdocker
       class Real
         def container_get(id)
-          raw_container = Docker::Container.get(id).json
+          raw_container = Docker::Container.get(id, {}, @connection).json
           processed_container = downcase_hash_keys(raw_container)
           processed_container['hostconfig_port_bindings'] = raw_container['HostConfig']['PortBindings']
           processed_container['hostconfig_links']         = raw_container['HostConfig']['Links']

data/lib/fog/fogdocker/requests/compute/image_all.rb

@@ -3,7 +3,7 @@ module Fog
     class Fogdocker
       class Real
         def image_all(filters = {})
-          Docker::Image.all.map do |image|
+          Docker::Image.all({}, @connection).map do |image|
             downcase_hash_keys(image.json)
           end
         end

data/lib/fog/fogdocker/requests/compute/image_create.rb

@@ -3,7 +3,7 @@ module Fog
     class Fogdocker
       class Real
         def image_create(attrs)
-          downcase_hash_keys Docker::Image.create(attrs).json
+          downcase_hash_keys Docker::Image.create(attrs, nil, @connection).json
         end
       end
 

data/lib/fog/fogdocker/requests/compute/image_delete.rb

@@ -4,7 +4,7 @@ module Fog
       class Real
         def image_delete(options = {})
           raise ArgumentError, "instance id is a required parameter" unless options.key? :id
-          image = Docker::Image.get(options[:id])
+          image = Docker::Image.get(options[:id], {}, @connection)
           image.remove()
         end
       end

data/lib/fog/fogdocker/requests/compute/image_get.rb

@@ -3,7 +3,7 @@ module Fog
     class Fogdocker
       class Real
         def image_get(id)
-          downcase_hash_keys Docker::Image.get(id).json
+          downcase_hash_keys Docker::Image.get(id, {}, @connection).json
         end
       end
       class Mock

data/lib/fog/fogdocker/requests/compute/image_search.rb

@@ -3,7 +3,7 @@ module Fog
     class Fogdocker
       class Real
         def image_search(query = {})
-          Docker::Util.parse_json(Docker.connection.get('/images/search', query)).map do |image|
+          Docker::Util.parse_json(@connection.get('/images/search', query)).map do |image|
             downcase_hash_keys(image)
           end
         end

data/lib/fog/google/compute.rb

@@ -4,7 +4,8 @@ module Fog
   module Compute
     class Google < Fog::Service
       requires :google_project
-      recognizes :app_name, :app_version, :google_client_email, :google_key_location, :google_key_string, :google_client
+      recognizes :app_name, :app_version, :google_client_email, :google_key_location, :google_key_string,
+                 :google_client, :google_json_key_location, :google_json_key_string
 
       GOOGLE_COMPUTE_API_VERSION     = 'v1'
       GOOGLE_COMPUTE_BASE_URL        = 'https://www.googleapis.com/compute/'

data/lib/fog/google/core.rb

@@ -45,6 +45,8 @@ module Fog
       # @option options [String] :google_client_email A @developer.gserviceaccount.com email address to use
       # @option options [String] :google_key_location The location of a pkcs12 key file
       # @option options [String] :google_key_string The content of the pkcs12 key file
+      # @option options [String] :google_json_key_location The location of a JSON key file
+      # @option options [String] :google_json_key_string The content of the JSON key file
       # @option options [String] :google_api_scope_url The access scope URLs
       # @option options [String] :app_name The app name to set in the user agent
       # @option options [String] :app_version The app version to set in the user agent
@@ -64,19 +66,14 @@ module Fog
         client = options[:google_client]
         return client unless client.nil?
 
+        # Create a signing key
+        signing_key = create_signing_key(options)
+
         # Validate required arguments
         unless options[:google_client_email]
           raise ArgumentError.new('Missing required arguments: google_client_email')
         end
 
-        if options[:google_key_location]
-          google_key = File.expand_path(options[:google_key_location])
-        elsif options[:google_key_string]
-          google_key = options[:google_key_string]
-        else
-          raise ArgumentError.new('Missing required arguments: google_key_location or google_key_string')
-        end
-
         unless options[:google_api_scope_url]
           raise ArgumentError.new('Missing required arguments: google_api_scope_url')
         end
@@ -84,23 +81,56 @@ module Fog
         # Create a new Google API Client
         self.new_pk12_google_client(
           options[:google_client_email],
-          google_key,
+          signing_key,
           options[:google_api_scope_url],
           options[:app_name],
           options[:app_version]
         )
       end
 
+      ##
+      # Creates a Google signing key
+      #
+      def create_signing_key(options)
+        if options[:google_json_key_location] || options[:google_json_key_string]
+          if options[:google_json_key_location]
+            json_key_location = File.expand_path(options[:google_json_key_location])
+            json_key = File.open(json_key_location, 'r') { |file| file.read }
+          else
+            json_key = options[:google_json_key_string]
+          end
+
+          json_key_hash = Fog::JSON.decode(json_key)
+          unless json_key_hash.has_key?('client_email') || json_key_hash.has_key?('private_key')
+            raise ArgumentError.new('Invalid Google JSON key')
+          end
+
+          options[:google_client_email] = json_key_hash['client_email']
+          ::Google::APIClient::KeyUtils.load_from_pem(json_key_hash['private_key'], 'notasecret')
+        elsif options[:google_key_location] || options[:google_key_string]
+          if options[:google_key_location]
+            google_key = File.expand_path(options[:google_key_location])
+          else
+            google_key = options[:google_key_string]
+          end
+
+          ::Google::APIClient::KeyUtils.load_from_pkcs12(google_key, 'notasecret')
+        else
+          raise ArgumentError.new('Missing required arguments: google_key_location, google_key_string, ' \
+                                  'google_json_key_location or google_json_key_string')
+        end
+      end
+
       ##
       # Create a Google API Client with a user email and a pkcs12 key
       #
       # @param [String] google_client_email A @developer.gserviceaccount.com email address to use
-      # @param [String] google_key An absolute location to a pkcs12 key file or the content of the file itself
+      # @param [OpenSSL::PKey] signing_key The private key for signing
       # @param [String] google_api_scope_url Access scope URLs
       # @param [String] app_name The app name to set in the user agent
       # @param [String] app_version The app version to set in the user agent
       # @return [Google::APIClient] Google API Client
-      def new_pk12_google_client(google_client_email, google_key, google_api_scope_url, app_name = nil, app_version = nil)
+      def new_pk12_google_client(google_client_email, signing_key, google_api_scope_url, app_name = nil, app_version = nil)
         application_name = app_name.nil? ? 'fog' : "#{app_name}/#{app_version || '0.0.0'} fog"
         api_client_options = {
           :application_name => application_name,
@@ -115,7 +145,7 @@ module Fog
             :client_x509_cert_url => "https://www.googleapis.com/robot/v1/metadata/x509/#{google_client_email}",
             :issuer => google_client_email,
             :scope => google_api_scope_url,
-            :signing_key => ::Google::APIClient::KeyUtils.load_from_pkcs12(google_key, 'notasecret'),
+            :signing_key => signing_key,
             :token_credential_uri => 'https://accounts.google.com/o/oauth2/token',
           }
         )