chef-metal-fog 0.5.beta.2 → 0.5.beta.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fdf92586a21978285397db7d6e107f393f497f3b
-  data.tar.gz: 9d46beeeae6d982ffa36b185679195e7e97db8c5
+  metadata.gz: 1eee68d2204401956fc7abcaa093bc9c203e1d28
+  data.tar.gz: 4e14f8d8cc4e4821c79713b0a655686342837caf
 SHA512:
-  metadata.gz: 662546f7745a1ec9a914951b6534a61b560c5d4b927e48705ad1cbeff229d8334bc1c8e74d0c0bb2f56436c6e51d671158cae49565cf40bc0b223aaf56d8feea
-  data.tar.gz: 1f9a2e09eea5a1c48e7d14f9b8b10ed4931315a713d66d03a60fea187c12003b24e5df41f08d4efe4e2252b655cf32b968fe64fab47505cc4a58954e682f30ab
+  metadata.gz: 35084cc9f278d5788f63094484d8f837d34ce856ef5e65076c27a1035ba5f4df57621fdaa27a97640af61956475e0524c370cabb812632bc3d297169b7b655f1
+  data.tar.gz: 27031e7de4dc5ab6efb343bb685eeada72ef50aa49f24812583d832234431a062d55ccac657d771fdd39bb88dec40bdc5f3b8966e57b026105f620621f4e78f5

data/README.md

@@ -1,3 +1,3 @@
 # chef-metal-fog
 
-This is the Fog driver for chef-metal.  It provides EC2, DigitalOcean and Openstack functionality.
+This is the Fog driver for chef-metal.  It provides EC2, Rackspace, DigitalOcean and Openstack functionality.

data/lib/chef/provider/fog_key_pair.rb

@@ -19,7 +19,7 @@ class Chef::Provider::FogKeyPair < Chef::Provider::LWRPBase
         case new_driver.compute_options[:provider]
         when 'DigitalOcean'
           compute.destroy_key_pair(@current_id)
-        when 'OpenStack'
+        when 'OpenStack', 'Rackspace'
           compute.key_pairs.destroy(@current_id)
         else
           compute.key_pairs.delete(new_resource.name)
@@ -54,7 +54,7 @@ class Chef::Provider::FogKeyPair < Chef::Provider::LWRPBase
       case new_driver.compute_options[:provider]
       when 'DigitalOcean'
         new_fingerprints = [Cheffish::KeyFormatter.encode(desired_key, :format => :openssh)]
-      when 'OpenStack'
+      when 'OpenStack', 'Rackspace'
         new_fingerprints = [Cheffish::KeyFormatter.encode(desired_key, :format => :openssh)]
       else
         # “The nice thing about standards is that you have so many to
@@ -81,7 +81,7 @@ class Chef::Provider::FogKeyPair < Chef::Provider::LWRPBase
             case new_driver.compute_options[:provider]
             when 'DigitalOcean'
               compute.create_ssh_key(new_resource.name, Cheffish::KeyFormatter.encode(desired_key, :format => :openssh))
-            when 'OpenStack'
+            when 'OpenStack', 'Rackspace'
               compute.create_key_pair(new_resource.name, Cheffish::KeyFormatter.encode(desired_key, :format => :openssh))
             else
               compute.key_pairs.get(new_resource.name).destroy
@@ -101,7 +101,7 @@ class Chef::Provider::FogKeyPair < Chef::Provider::LWRPBase
         case new_driver.compute_options[:provider]
         when 'DigitalOcean'
           compute.create_ssh_key(new_resource.name, Cheffish::KeyFormatter.encode(desired_key, :format => :openssh))
-        when 'OpenStack'
+        when 'OpenStack', 'Rackspace'
           compute.create_key_pair(new_resource.name, Cheffish::KeyFormatter.encode(desired_key, :format => :openssh))
         else
           compute.import_key_pair(new_resource.name, Cheffish::KeyFormatter.encode(desired_key, :format => :openssh))
@@ -189,7 +189,7 @@ class Chef::Provider::FogKeyPair < Chef::Provider::LWRPBase
       else
         current_resource.action :delete
       end
-    when 'OpenStack'
+    when 'OpenStack', 'Rackspace'
       current_key_pair = compute.key_pairs.get(new_resource.name)
       if current_key_pair
         @current_id = current_key_pair.name

data/lib/chef_metal_fog/aws_credentials.rb

@@ -8,6 +8,8 @@ module ChefMetalFog
       @credentials = {}
     end
 
+    include Enumerable
+
     def default
       @credentials[ENV['AWS_DEFAULT_PROFILE'] || 'default'] || @credentials.first[1]
     end
@@ -51,7 +53,7 @@ module ChefMetalFog
     end
 
     def load_default
-      load_ini('~/.aws/config')
+      load_ini(ENV['AWS_CONFIG_FILE'] || File.expand_path('~/.aws/config'))
     end
 
     def self.method_missing(name, *args, &block)

data/lib/chef_metal_fog/fog_driver.rb

@@ -29,6 +29,7 @@ module ChefMetalFog
   #   fog:AWS:<account_id>
   #   fog:OpenStack:https://identityHost:portNumber/v2.0
   #   fog:DigitalOcean:<client id>
+  #   fog:Rackspace:https://identity.api.rackspacecloud.com/v2.0
   #
   # Identifier is generally something uniquely identifying the account.  If multiple
   # users can access the account, the identifier should be the same for all of
@@ -93,9 +94,13 @@ module ChefMetalFog
 
     # Passed in a driver_url, and a config in the format of Driver.config.
     def self.from_url(driver_url, config)
+      FogDriver.new(driver_url, config)
+    end
+
+    def self.canonicalize_url(driver_url, config)
       scheme, provider, id = driver_url.split(':', 3)
       config, id = compute_options_for(provider, id, config)
-      FogDriver.new("fog:#{provider}:#{id}", config)
+      [ "fog:#{provider}:#{id}", config ]
     end
 
     # Passed in a config which is *not* merged with driver_url (because we don't
@@ -129,7 +134,7 @@ module ChefMetalFog
     end
 
     def compute_options
-      driver_options[:compute_options] || {}
+      driver_options[:compute_options].to_hash || {}
     end
 
     def provider
@@ -248,6 +253,8 @@ module ChefMetalFog
             driver_options[:aws_account_info][:aws_username]
           when 'OpenStack'
             compute_options[:openstack_username]
+          when 'Rackspace'
+            compute_options[:rackspace_username]
         end
         server = compute.servers.create(bootstrap_options)
         machine_spec.location = {
@@ -491,9 +498,9 @@ module ChefMetalFog
       ssh_options = ssh_options_for(machine_spec, server)
       # If we're on AWS, the default is to use ubuntu, not root
       if provider == 'AWS'
-        username = machine_spec.location[:ssh_username] || 'ubuntu'
+        username = machine_spec.location['ssh_username'] || 'ubuntu'
       else
-        username = machine_spec.location[:ssh_username] || 'root'
+        username = machine_spec.location['ssh_username'] || 'root'
       end
       options = {}
       if machine_spec.location[:sudo] || (!machine_spec.location.has_key?(:sudo) && username != 'root')
@@ -501,7 +508,7 @@ module ChefMetalFog
       end
 
       remote_host = nil
-      if machine_spec.location[:use_private_ip_for_ssh]
+      if machine_spec.location['use_private_ip_for_ssh']
         remote_host = server.private_ip_address
       elsif !server.public_ip_address
         Chef::Log.warn("Server has no public ip address.  Using private ip '#{server.private_ip_address}'.  Set driver option 'use_private_ip_for_ssh' => true if this will always be the case ...")
@@ -514,7 +521,7 @@ module ChefMetalFog
 
       #Enable pty by default
       options[:ssh_pty_enable] = true
-      options[:ssh_gateway] = machine_spec.location[:ssh_gateway] if machine_spec.location.has_key?(:ssh_gateway)
+      options[:ssh_gateway] = machine_spec.location['ssh_gateway'] if machine_spec.location.has_key?('ssh_gateway')
 
       ChefMetal::Transport::SSH.new(remote_host, username, ssh_options, options, config)
     end
@@ -539,19 +546,25 @@ module ChefMetalFog
           new_compute_options[:digitalocean_client_id] = id
         when 'OpenStack'
           new_compute_options[:openstack_auth_url] = id
+        when 'Rackspace'
+          new_compute_options[:rackspace_auth_url] = id
+        when 'CloudStack'
+          cloudstack_uri = URI.parse(id)
+          new_compute_options[:cloudstack_scheme] = cloudstack_uri.scheme
+          new_compute_options[:cloudstack_host]   = cloudstack_uri.host
+          new_compute_options[:cloudstack_port]   = cloudstack_uri.port
+          new_compute_options[:cloudstack_path]   = cloudstack_uri.path
         else
           raise "unsupported fog provider #{provider}"
         end
-      elsif provider == 'AWS'
-        driver_options[:aws_profile] = 'default'
       end
 
       # Set auth info from environment
       case provider
       when 'AWS'
         # Grab the profile
-        aws_profile = FogDriverAWS.get_aws_profile(driver_options, compute_options, id)
-        [ :aws_access_key_id, :aws_secret_access_key, :aws_session_token ].each do |key|
+        aws_profile = FogDriverAWS.get_aws_profile(driver_options, id)
+        [ :aws_access_key_id, :aws_secret_access_key, :aws_session_token, :region ].each do |key|
           new_compute_options[key] = aws_profile[key] if aws_profile[key]
         end
       when 'OpenStack'
@@ -564,6 +577,15 @@ module ChefMetalFog
         new_compute_options[:openstack_api_key] ||= credential[:openstack_api_key]
         new_compute_options[:openstack_auth_url] ||= credential[:openstack_auth_url]
         new_compute_options[:openstack_tenant] ||= credential[:openstack_tenant]
+      when 'Rackspace'
+        credential = Fog.credential
+
+        new_compute_options[:rackspace_username] ||= credential[:rackspace_username]
+        new_compute_options[:rackspace_api_key] ||= credential[:rackspace_api_key]
+        new_compute_options[:rackspace_auth_url] ||= credential[:rackspace_auth_url]
+        new_compute_options[:rackspace_region] ||= credential[:rackspace_region]
+        new_compute_options[:rackspace_endpoint] ||= credential[:rackspace_endpoint]
+        new_compute_options[:rackspace_compute_url] ||= credential[:rackspace_compute_url]
       end
 
       config = Cheffish::MergedConfig.new(new_config, config)
@@ -574,9 +596,18 @@ module ChefMetalFog
           new_config[:driver_options][:aws_account_info] = account_info
           account_info[:aws_account_id]
         when 'DigitalOcean'
-          compute_options[:digitalocean_client_id]
+          config[:driver_options][:compute_options][:digitalocean_client_id]
         when 'OpenStack'
-          compute_options[:openstack_auth_url]
+          config[:driver_options][:compute_options][:openstack_auth_url]
+        when 'Rackspace'
+          config[:driver_options][:compute_options][:rackspace_auth_url]
+        when 'CloudStack'
+          host   = config[:driver_options][:compute_options][:cloudstack_host]
+          path   = config[:driver_options][:compute_options][:cloudstack_path]    || '/client/api'
+          port   = config[:driver_options][:compute_options][:cloudstack_port]    || 443
+          scheme = config[:driver_options][:compute_options][:cloudstack_scheme]  || 'https'
+
+          URI.scheme_list[scheme.upcase].build(:host => host, :port => port, :path => path).to_s
         end
 
       [ config, id ]

data/lib/chef_metal_fog/fog_driver_aws.rb

@@ -4,33 +4,42 @@ require 'fog/aws'
 
 module ChefMetalFog
   module FogDriverAWS
-    def self.get_aws_profile(driver_options, compute_options, aws_account_id)
+    def self.get_aws_profile(driver_options, aws_account_id)
       aws_credentials = get_aws_credentials(driver_options)
 
-      # Grab the given profile
-      aws_access_key_id = compute_options[:aws_access_key_id] || ENV['AWS_ACCESS_KEY_ID']
-      if aws_access_key_id
-        aws_profile = aws_credentials.select { |profile| profile[:aws_access_key_id] == aws_access_key_id }.first
-        if !aws_profile
-          aws_profile = {
-            :aws_access_key_id => aws_access_key_id,
-            :aws_secret_access_key => compute_options[:aws_secret_access_key] || ENV['AWS_SECRET_ACCESS_KEY'],
-            :aws_security_token => compute_options[:aws_security_token] || ENV['AWS_SECURITY_TOKEN']
-          }
-        end
-        Chef::Log.debug("Using AWS profile #{aws_profile[:name]}")
+      # Order of operations:
+      # driver_options[:aws_access_key_id] / driver_options[:aws_secret_access_key] / driver_options[:aws_security_token]
+      # driver_options[:aws_profile]
+      # ENV['AWS_ACCESS_KEY_ID'] / ENV['AWS_SECRET_ACCESS_KEY'] / ENV['AWS_SECURITY_TOKEN']
+      # ENV['AWS_PROFILE']
+      # ENV['DEFAULT_PROFILE']
+      # 'default'
+      aws_profile = if driver_options[:aws_access_key_id]
+        Chef::Log.debug("Using AWS driver access key options")
+        {
+          :aws_access_key_id => driver_options[:aws_access_key_id],
+          :aws_secret_access_key => driver_options[:aws_secret_access_key],
+          :aws_security_token => driver_options[:aws_security_token]
+        }
       elsif driver_options[:aws_profile]
-        aws_profile = aws_credentials[driver_options[:aws_profile]]
-        if !aws_profile
-          raise "AWS profile #{driver_options[:aws_profile]} does not exist! Perhaps your configuration is incorrect?"
-        end
-        Chef::Log.info("Using AWS profile #{driver_options[:aws_profile]} ...")
+        Chef::Log.debug("Using AWS profile #{driver_options[:aws_profile]}")
+        aws_credentials[driver_options[:aws_profile]]
+      elsif ENV['AWS_ACCESS_KEY_ID']
+        Chef::Log.debug("Using AWS environment variable access keys")
+        {
+          :aws_access_key_id => ENV['AWS_ACCESS_KEY_ID'],
+          :aws_secret_access_key => ENV['AWS_SECRET_ACCESS_KEY'],
+          :aws_security_token => ENV['AWS_SECURITY_TOKEN']
+        }
+      elsif ENV['AWS_PROFILE']
+        Chef::Log.debug("Using AWS profile #{ENV['AWS_PROFILE']} from AWS_PROFILE environment variable")
+        aws_credentials[ENV['AWS_PROFILE']]
       else
-        aws_profile = aws_credentials.default
-        Chef::Log.info("Using default AWS profile ...")
+        Chef::Log.debug("Using AWS default profile")
+        aws_credentials.default
       end
 
-      # Merge in account info
+      # Merge in account info for profile
       if aws_profile
         aws_profile = aws_profile.merge(aws_account_info_for(aws_profile))
       end
@@ -46,8 +55,7 @@ module ChefMetalFog
       end
 
       # Set region
-      region = compute_options[:region] || ENV['AWS_DEFAULT_REGION']
-      aws_profile[:region] = region if region
+      aws_profile[:region] ||= ENV['AWS_DEFAULT_REGION']
       aws_profile.delete_if { |key, value| value.nil? }
       aws_profile
     end

data/lib/chef_metal_fog/recipe_dsl.rb

@@ -18,6 +18,11 @@ class Chef
       def with_fog_openstack_driver(driver_options = nil, &block)
         with_fog_driver('OpenStack', driver_options, &block)
       end
+
+      def with_fog_rackspace_driver(driver_options = nil, &block)
+        with_fog_driver('Rackspace', driver_options, &block)
+      end
+      
     end
   end
 end

data/lib/chef_metal_fog/version.rb

@@ -1,3 +1,3 @@
 module ChefMetalFog
-  VERSION = '0.5.beta.2'
+  VERSION = '0.5.beta.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chef-metal-fog
 version: !ruby/object:Gem::Version
-  version: 0.5.beta.2
+  version: 0.5.beta.3
 platform: ruby
 authors:
 - John Keiser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-28 00:00:00.000000000 Z
+date: 2014-05-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef