chef-provisioning-fog 0.17.0 → 0.18.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e48c5dfd96019788e8add883cf24a604e197e3d1
-  data.tar.gz: 5f6cdf09bb038c76620ed6492333e3a912ae3a6e
+  metadata.gz: 7a903c7684ebc84d52a05fb774779952b1769d46
+  data.tar.gz: 22c0d531e5664e6806e34b8401013afd77855125
 SHA512:
-  metadata.gz: f2a4be0a7ea606d12f33aa5942fc2c313644fb58dbb564ca804505fc5df774b6d4269a148d69e9987b102bfab86dbe839210a439d1a4f96d5181c5d3f9c05c96
-  data.tar.gz: 5a4b1ec56cf012cd0b59d0d4c48c5391b08d08390f67574e47918e1c12b992186fad1929f86c57b8c0a0b7c9b1701da2231c95b984677495a282bcbdddcfb162
+  metadata.gz: 838ce6611ff9ee741f622345a60f8d00244612b11a23d4912e23d432948cc9d11f9ba698fe672a1bee74e2e1830bab9695a6ceafb1234a9e0e0a854def4c5d5b
+  data.tar.gz: 31bbeddadc8045701cfb9e8d45873a99ab033bfe4a8592442a7db1b3fc728c6d09743648640de406da095ed5c2603e8a09496287ead31653e7166b67227f89ff

data/Gemfile

@@ -8,4 +8,5 @@ group :development do
   gem 'guard'
   gem 'guard-rspec'
   gem 'rb-readline'
+  gem 'simplecov'
 end

data/README.md

@@ -4,7 +4,7 @@
 [![Build Status](https://travis-ci.org/chef/chef-provisioning-fog.svg?branch=master)][travis]
 [![Dependency Status](https://img.shields.io/gemnasium/chef/chef-provisioning-fog.svg)][gemnasium]
 
-This is the Fog driver for Chef Provisioning.  It provides Amazon EC2, Rackspace, DigitalOcean, SoftLayer, OpenStack, vCloud Air and XenServer functionality.
+This is the Fog driver for Chef Provisioning.  It provides Amazon EC2, DigitalOcean, Google Compute Engine, IBM Softlayer, Joyent, OpenStack, Rackspace, vCloud Air and XenServer functionality.
 
 ## Documentation
 
@@ -21,48 +21,43 @@ These are the primary documents to help learn about using Provisioning and creat
 
 **A note about key pairs** - The key name used in `fog_key_pair` must be the same as the filename of the local key to be used. If the key does not exist in one of `private_key_paths` (which you can set in `knife.rb` or in a `client.rb`) it will be created.
 
-### DigitalOcean
+### Amazon EC2
 
-Update your `knife.rb` to contain your DigitalOcean API token and the driver:
+You'll need to update your `knife.rb` to work:
 
-```ruby
-driver 'fog:DigitalOcean'
-driver_options compute_options: { digitalocean_token: 'token' }
+You need one of the following for the driver:
+```
+fog:AWS:<account_id>:<region>
+fog:AWS:<profile_name>
+fog:AWS:<profile_name>:<region>
 ```
 
-For a full example see [examples/digitalocean/simple.rb](examples/digitalocean/simple.rb).
-
-### OpenStack
-
-You'll need to update your `knife.rb` to work:
+For example:
 
 ```ruby
-driver 'fog:OpenStack'
+driver 'fog:AWS:<account_id>:<region>'
 driver_options :compute_options => {
-                                     :openstack_auth_url => 'http://YOUROPENSTACK-CLOUD:5000/v2.0/tokens',
-                                     :openstack_username => 'YOUR-USERNAME',
-                                     :openstack_api_key  => 'YOUR-PASSWORD',
-                                     :openstack_tenant   => 'YOUR-TENANT-ID-NAME'
+                                    :aws_access_key_id => 'YOUR-ACCESS-KEY-ID',
+                                    :aws_secret_access_key => 'YOUR-SECRET-ACCESS-KEY',
+                                    :region => 'THE-REGION-YOU-WANT-TO-PROVISION-IN'
                                     }
 ```
 
-For a full example see [examples/openstack/simple.rb](examples/openstack/simple.rb).
+For a full example see [examples/aws/simple.rb](examples/aws/simple.rb).
 
-### Rackspace
 
-For this example, you must configure `knife.rb` with your credentials and a region to operate on. This example is [also available as a Github repo](https://github.com/martinb3/chef-provisioning-rackspace-example).
+### DigitalOcean
+
+Update your `knife.rb` to contain your DigitalOcean API token and the driver:
 
-You must configure some credentials and region in a `knife.rb` file like so:
 ```ruby
-driver 'fog:Rackspace'
-driver_options :compute_options => {
-                                     :rackspace_username => 'MY-RACKSPACE-USERr',
-                                     :rackspace_api_key  => 'API-KEY-FOR-USER',
-                                     :rackspace_region => 'dfw' # could be 'org', 'iad', 'hkg', etc
-                                    }
+driver 'fog:DigitalOcean'
+driver_options compute_options: {
+                                  digitalocean_token: 'token'
+                                }
 ```
 
-For a full example see [examples/rackspace/simple.rb](examples/rackspace/simple.rb).
+For a full example see [examples/digitalocean/simple.rb](examples/digitalocean/simple.rb).
 
 ### Google Compute Engine
 
@@ -70,7 +65,8 @@ You'll need to update your `knife.rb` to work:
 
 ```ruby
 driver 'fog:Google'
-driver_options :compute_options => { :provider => 'google',
+driver_options :compute_options => {
+                                     :provider => 'google',
                                      :google_project => 'YOUR-PROJECT-ID', # the name will work here
                                      :google_client_email => 'YOUR-SERVICE-ACCOUNT-EMAIL',
                                      :google_key_location => 'YOUR-SERVICE-P12-KEY-FILE-FULL-PATH.p12'
@@ -89,13 +85,44 @@ For a full simple example see [examples/google/simple.rb](examples/google/simple
 For an example that shows a different `:disk_type` see
 [examples/google/simple_different_disk.rb](examples/google/simple_different_disk.rb).
 
-###  Joyent
+### IBM SoftLayer
+
+You'll need to update your `knife.rb` to work with this also:
+
+```ruby
+driver 'fog:SoftLayer'
+driver_options :compute_options => {
+                                     :provider => 'softlayer',
+                                     :softlayer_username => 'username',
+                                     :softlayer_api_key => 'api_key',
+                                     :softlayer_default_domain => 'example.com',
+                                   }
+
+```
+
+Once you or your administrator has created a SoftLayer account you can manage
+your API key at https://control.softlayer.com/account/users
+
+`:bootstrap_options => {:key_name => 'label'}` is looked up by_label; make sure
+you have a public key created on control portal at
+https://control.softlayer.com/devices/sshkeys with a matching label.
+
+NOTE: the SoftLayer driver injects a custom post provisioning script that
+ensures some packages needed by chef-provisioning-fog to install chef are
+present (e.g. sudo). The injected script will call your :postInstallScriptUri
+if you define one. The driver will wait until the injected script is done. The
+driver and script communicate using userMetadata so you cannot use metadata.
+
+For a full example see [examples/softlayer/simple.rb](examples/softlayer/simple.rb).
+
+### Joyent
 
 You'll need to update your `knife.rb` to work:
 
 ```ruby
 driver 'fog:Joyent'
-driver_options :compute_options => { :joyent_username => 'YOUR-JOYENT-LOGIN',
+driver_options :compute_options => {
+                                     :joyent_username => 'YOUR-JOYENT-LOGIN',
                                      :joyent_password => 'YOUR-JOYENT-PASSWORD',
                                      :joyent_keyname => 'THE-SSH-KEY-YOUVE-UPLOADED',
                                      :joyent_version => '7.3.0', # if you are using the joyent public cloud
@@ -111,34 +138,47 @@ For a more in-depth usage of this driver to use with either Private or Public Jo
 
 For a infrastructure container example see [examples/joyent/infrastructure.rb](examples/joyent/infrastructure.rb).
 
-### IBM SoftLayer
 
-You'll need to update your `knife.rb` to work with this also:
+### OpenStack
+
+You'll need to update your `knife.rb` to work:
 
 ```ruby
-driver 'fog:SoftLayer'
-driver_options :compute_options => { :provider => 'softlayer',
-                                     :softlayer_username => 'username',
-                                     :softlayer_api_key => 'api_key',
-                                     :softlayer_default_domain => 'example.com',
-                                   }
+driver 'fog:OpenStack'
+driver_options :compute_options => {
+                                     :openstack_auth_url => 'http://YOUROPENSTACK-CLOUD:5000/v2.0/tokens',
+                                     :openstack_username => 'YOUR-USERNAME',
+                                     :openstack_api_key  => 'YOUR-PASSWORD',
+                                     :openstack_tenant   => 'YOUR-TENANT-ID-NAME'
+                                    }
+```
+
+For a full example see [examples/openstack/simple.rb](examples/openstack/simple.rb).
+
+### Rackspace
 
+For this example, you must configure `knife.rb` with your credentials and a region to operate on. This example is [also available as a Github repo](https://github.com/martinb3/chef-provisioning-rackspace-example).
+
+You must configure some credentials and region in a `knife.rb` file like so:
+```ruby
+driver 'fog:Rackspace'
+driver_options :compute_options => {
+                                     :rackspace_username => 'MY-RACKSPACE-USERr',
+                                     :rackspace_api_key  => 'API-KEY-FOR-USER',
+                                     :rackspace_region => 'dfw' # could be 'org', 'iad', 'hkg', etc
+                                    }
 ```
 
-Once you or your administrator has created a SoftLayer account you can manage
-your API key at https://control.softlayer.com/account/users
+For a full example see [examples/rackspace/simple.rb](examples/rackspace/simple.rb).
 
-`:bootstrap_options => {:key_name => 'label'}` is looked up by_label; make sure
-you have a public key created on control portal at
-https://control.softlayer.com/devices/sshkeys with a matching label.
+### vCloud Air
 
-NOTE: the SoftLayer driver injects a custom post provisioning script that
-ensures some packages needed by chef-provisioning-fog to install chef are
-present (e.g. sudo). The injected script will call your :postInstallScriptUri
-if you define one. The driver will wait until the injected script is done. The
-driver and script communicate using userMetadata so you cannot use metadata.
+Docs TODO.
+
+### XenServer
+
+Docs TODO.
 
-For a full example see [examples/softlayer/simple.rb](examples/softlayer/simple.rb).
 
 ### Cleaning up
 
@@ -165,10 +205,9 @@ Chef Provisioning has two major abstractions: the machine resource, and drivers.
 
 You declare what your machines do (recipes, tags, etc.) with the `machine` resource, the fundamental unit of Chef Provisioning.  You will typically declare `machine` resources in a separate, OS/provisioning-independent file that declares the *topology* of your app--your machines and the recipes that will run on them.
 
-The machine resources from the [cluster.rb example](https://github.com/chef/chef-provisioning/blob/master/docs/examples/cluster.rb) are pretty straightforward.  Here's a copy/paste:
+The machine resources from the [cluster.rb example](https://github.com/chef/chef-provisioning/blob/master/docs/examples/cluster.rb) are pretty straightforward.  Here's a copy/paste, it'll create a database machine then one web server.
 
 ```ruby
-# Database!
 machine 'mario' do
   recipe 'postgresql'
   recipe 'mydb'
@@ -177,7 +216,6 @@ end
 
 num_webservers = 1
 
-# Web servers!
 1.upto(num_webservers) do |i|
   machine "luigi#{i}" do
     recipe 'apache'

data/Rakefile

@@ -1,8 +1,9 @@
 require 'bundler'
 require 'bundler/gem_tasks'
 
+desc "run specs"
 task :spec do
-  require File.expand_path('spec/run')
+  sh "bundle exec rspec"
 end
 
 require "github_changelog_generator/task"

data/lib/chef/provisioning/fog_driver/driver.rb

@@ -244,7 +244,7 @@ module FogDriver
           machine_spec.reference = nil
         end
       end
-      strategy = convergence_strategy_for(machine_spec, machine_options)
+      strategy = ConvergenceStrategy::NoConverge.new(machine_options[:convergence_options], config)
       strategy.cleanup_convergence(action_handler, machine_spec)
     end
 
@@ -297,7 +297,8 @@ module FogDriver
       specs_and_options.each do |machine_spec, machine_options|
         server = specs_and_servers[machine_spec]
         if server
-          if %w(terminated archive DELETED).include?(server.state) # Can't come back from that
+          server_state = server.respond_to?(:status) ? server.status : server.state
+          if %w(terminated archive DELETED).include?(server_state.downcase) # Can't come back from that
             Chef::Log.warn "Machine #{machine_spec.name} (#{server.id} on #{driver_url}) is terminated.  Recreating ..."
           else
             yield machine_spec, server if block_given?
@@ -307,13 +308,13 @@ module FogDriver
           Chef::Log.warn "Machine #{machine_spec.name} (#{machine_spec.reference['server_id']} on #{driver_url}) no longer exists.  Recreating ..."
         end
 
-        machine_spec.reference ||= {}
-        machine_spec.reference.update(
-            'driver_url' => driver_url,
-            'driver_version' => FogDriver::VERSION,
-            'creator' => creator,
-            'allocated_at' => Time.now.to_i
-        )
+      machine_spec.reference ||= {}
+      machine_spec.reference.update(
+        'driver_url' => driver_url,
+        'driver_version' => FogDriver::VERSION,
+        'creator' => creator,
+        'allocated_at' => Time.now.to_i
+      )
 
         bootstrap_options = bootstrap_options_for(action_handler, machine_spec, machine_options)
         machine_spec.reference['key_name'] = bootstrap_options[:key_name] if bootstrap_options[:key_name]
@@ -375,13 +376,13 @@ module FogDriver
 
     def start_server(action_handler, machine_spec, server)
       # If it is stopping, wait for it to get out of "stopping" transition status before starting
-      if server.state == 'stopping'
+      server_state = server.respond_to?(:status) ? server.status : server.state
+      if server_state == 'stopping'
         action_handler.report_progress "wait for #{machine_spec.name} (#{server.id} on #{driver_url}) to finish stopping ..."
-        server.wait_for { server.state != 'stopping' }
+        server.wait_for { server_state != 'stopping' }
         action_handler.report_progress "#{machine_spec.name} is now stopped"
       end
-
-      if server.state == 'stopped'
+      if server_state == 'stopped'
         action_handler.perform_action "start machine #{machine_spec.name} (#{server.id} on #{driver_url})" do
           server.start
           machine_spec.reference['started_at'] = Time.now.to_i

data/lib/chef/provisioning/fog_driver/providers/digitalocean.rb

@@ -10,6 +10,13 @@ module FogDriver
         ''
       end
 
+      def convergence_strategy_for(machine_spec, machine_options)
+        machine_options = Cheffish::MergedConfig.new(machine_options, {
+                                                       :convergence_options => {:ohai_hints => {'digital_ocean' => {}}}
+                                                     })
+        super(machine_spec, machine_options)
+      end
+
       def converge_floating_ips(action_handler, machine_spec, machine_options, server)
         # DigitalOcean does not have floating IPs
       end

data/lib/chef/provisioning/fog_driver/providers/google.rb

@@ -9,6 +9,13 @@ class Chef
             ''
           end
 
+          def convergence_strategy_for(machine_spec, machine_options)
+            machine_options = Cheffish::MergedConfig.new(machine_options, {
+                                                           :convergence_options => {:ohai_hints => {'gce' => {}}}
+                                                         })
+            super(machine_spec, machine_options)
+          end
+
           def converge_floating_ips(action_handler, machine_spec, machine_options, server)
           end
 

data/lib/chef/provisioning/fog_driver/providers/openstack.rb

@@ -11,6 +11,13 @@ module FogDriver
         compute_options[:openstack_username]
       end
 
+      def convergence_strategy_for(machine_spec, machine_options)
+        machine_options = Cheffish::MergedConfig.new(machine_options, {
+                                                       :convergence_options => {:ohai_hints => {'openstack' => {}}}
+                                                     })
+        super(machine_spec, machine_options)
+      end
+
       def self.compute_options_for(provider, id, config)
         new_compute_options = {}
         new_compute_options[:provider] = provider

data/lib/chef/provisioning/fog_driver/providers/rackspace.rb

@@ -11,6 +11,14 @@ module FogDriver
         compute_options[:rackspace_username]
       end
 
+      def convergence_strategy_for(machine_spec, machine_options)
+        machine_options = Cheffish::MergedConfig.new(machine_options, {
+                                                       :convergence_options => {:ohai_hints => {'rackspace' => {}}}
+                                                     })
+        super(machine_spec, machine_options)
+      end
+
+
       def self.compute_options_for(provider, id, config)
         new_compute_options = {}
         new_compute_options[:provider] = provider

data/lib/chef/provisioning/fog_driver/providers/softlayer.rb

@@ -17,6 +17,13 @@ class Chef
             compute_options[:softlayer_username]
           end
 
+          def convergence_strategy_for(machine_spec, machine_options)
+            machine_options = Cheffish::MergedConfig.new(machine_options, {
+                                                           :convergence_options => {:ohai_hints => {'softlayer' => {}}}
+                                                         })
+            super(machine_spec, machine_options)
+          end
+
           def self.compute_options_for(provider, id, config)
             new_compute_options = {}
             new_compute_options[:provider] = provider
@@ -211,4 +218,3 @@ SHELL
     end
   end
 end
-

data/lib/chef/provisioning/fog_driver/version.rb

@@ -1,7 +1,7 @@
 class Chef
   module Provisioning
     module FogDriver
-      VERSION = '0.17.0'
+      VERSION = '0.18.0'
     end
   end
 end

data/spec/spec_helper.rb

@@ -3,6 +3,14 @@ $:.unshift File.expand_path('../support', __FILE__)
 require 'fog'
 require 'chef/provisioning'
 require 'chef/provisioning/fog_driver/driver'
+require 'simplecov'
+
+SimpleCov.start do
+  # add_filter do |source_file|
+  #   # source_file.lines.count < 5
+  #   source.filename =~ /^#{SimpleCov.root}\/chef-provisioning-fake/)
+  # end
+end
 
 RSpec.configure do |config|
   config.run_all_when_everything_filtered = true

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: chef-provisioning-fog
 version: !ruby/object:Gem::Version
-  version: 0.17.0
+  version: 0.18.0
 platform: ruby
 authors:
 - John Keiser
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-28 00:00:00.000000000 Z
+date: 2016-03-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef-provisioning