chef-metal 0.11.2 → 0.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 981fd5efdbfbd9cd36af5130db558fe02031d1fa
-  data.tar.gz: 5cccedc69fa523bd819264e8c2f14954ffc5b9e0
+  metadata.gz: 7a7515b106ed73e6422effeb0d2852898cdc6881
+  data.tar.gz: 3ea617d4302dad8f8b3578a07dc09b28aba3bcf8
 SHA512:
-  metadata.gz: 9ec8bc62069ff303a9b7edd1478a76b4f51258cecfb198a193de9f8565db8edb029c3a79a6b381096d83228bb93f8a970097563414002c76642295d5ea4084eb
-  data.tar.gz: cede91bb04689b265f850964ee9d7c20d2588c80e06835fd7178c319c63c412cf4b8e4602d966327431f53992b53f568de125074650b80c492155fa1f82334bb
+  metadata.gz: a3b431067edb0ae001832ef82ddcf55e1e453a58b089a0df61c2722ef9ce6e75b4a0887c2a9b524534f20d54c8058c79e01326024491800e179eebf384c98254
+  data.tar.gz: 6faab0a7397d677e9c46fcc314f8efc8ee3067038ce92d69096822a1bc5afceaf0cb8d7232fa7d062769cfd8309d141ebd27e633f0866397f9c4d59d9237ca69

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Chef Metal Changelog
 
+## 0.12 (6/18/2014)
+
+- Remove chef-metal-fog and chef-metal-vagrant as dependencies (install whatever things you want directly!)
+- Fix ssl_verify_mode to work correctly when other HTTPS calls are made (@mwrock)
+- Fix machine_file and machine_execute resources (@irvingpop)
+
 ## 0.11.2 (6/4/2014)
 
 - Fix issue where machines with different drivers could get default options from the global current driver

data/README.md

@@ -10,7 +10,7 @@ Date       | Blog
 6/3/2014   | [machine_batch and parallelization](https://github.com/opscode/chef-metal/blob/master/docs/blogs/2012-05-28-machine_batch.html.markdown#chef-metal-parallelization)
 6/3/2014   | [Chef Metal, Configuration and Drivers](https://github.com/opscode/chef-metal/blob/master/docs/blogs/2012-05-22-new-driver-interface.html.markdown#chef-metal-configuration-and-drivers)
 3/4/2014   | [Chef Metal 0.2: Overview](http://www.getchef.com/blog/2014/03/04/chef-metal-0-2-release/) - this is a pretty good overview (though dated).
-12/20/2014 | [Chef Metal Alpha](http://www.getchef.com/blog/2013/12/20/chef-metal-alpha/)
+12/20/2013 | [Chef Metal Alpha](http://www.getchef.com/blog/2013/12/20/chef-metal-alpha/)
 
 Try It Out
 ----------
@@ -24,7 +24,7 @@ HINT: chef-metal looks prettiest with chef 11.14 alpha.  `gem install chef --pre
 To give it a spin, install Vagrant and VirtualBox and try this from the `chef-metal/docs/examples` directory:
 
 ```
-gem install chef-metal
+gem install chef-metal chef-metal-vagrant
 export CHEF_DRIVER=vagrant
 chef-client -z vagrant_linux.rb simple.rb
 ```
@@ -36,13 +36,29 @@ This will create two vagrant precise64 linux boxes, "mario" and "luigi1", in `~/
 If you have an AWS account, you can spin up a machine there like this:
 
 ```
-gem install chef-metal
+gem install chef-metal chef-metal-fog
 export CHEF_DRIVER=fog:AWS
 chef-client -z simple.rb
 ```
 
 This will create two linux boxes in the AWS account referenced by your default profile in `~/.aws/config` (or your environment variables).
 
+### DigitalOcean
+
+If you are on DigitalOcean and using the `tugboat` gem, you can do this:
+
+```
+gem install chef-metal chef-metal-fog
+export CHEF_DRIVER=fog:DigitalOcean
+chef-client -z simple.rb
+```
+
+If you aren't using the `tugboat` gem, you can put `driver` and `driver_options` into your `.chef/knife.rb` file.
+
+This will use your tugboat settings to create whatever sort of instance you normally create.
+
+### Cleaning up
+
 When you are done with the examples, run this to clean up:
 
 ```
@@ -52,7 +68,7 @@ chef-client -z destroy_all.rb
 What Is Chef Metal?
 -------------------
 
-Chef Metal has two major abstractions: the machine resource, anf drivers.
+Chef Metal has two major abstractions: the machine resource, and drivers.
 
 ### The `machine` resource
 
@@ -183,7 +199,7 @@ with_machine_options :bootstrap_options => {
 
 You will notice that we are still using `simple.rb` here.  Machine definitions are generally driver-independent.  This is an important feature that allows you to spin up your clusters in different places to create staging, test or miniature dev environments.
 
-### Pointing Boxes at Servers
+### Pointing Boxes at Chef Servers
 
 By default, Chef Metal will put your boxes on the same Chef server you started chef-client with (in the case of -z, that's a local chef-zero server). Sometimes you want to put your boxes on different servers.  There are a couple of ways to do that:
 
@@ -218,4 +234,3 @@ Bugs and The Plan
 Please submit bugs, gripes and feature requests at [https://github.com/opscode/chef-metal/issues](https://twitter.com/jkeiser2), contact jkeiser on Twitter at @jkeiser2, email at [jkeiser@getchef.com](mailto:jkeiser@getchef.com)
 
 To contribute, just make a PR in the appropriate repo--also, make sure you've [signed the Chef Contributor License Agreement](https://secure.echosign.com/public/hostedForm?formid=PJIF5694K6L) (quick couple of minutes online), since this is going into core Chef eventually. It takes some time to process, so if you've just done it, let me know in the PR :)  If you already signed this for a Chef contribution, you don't need to do so again--if you're not sure, you can check for your name [here](https://wiki.opscode.com/display/chef/Approved+Contributors)!
-Â

data/lib/chef_metal/chef_run_data.rb

@@ -57,6 +57,15 @@ module ChefMetal
       driver.is_a?(String) ? driver_for_url(driver) : driver
     end
 
+    def connect_to_machine(name, chef_server = nil)
+      if name.is_a?(MachineSpec)
+        machine_spec = name
+      else
+        machine_spec = ChefMetal::ChefMachineSpec.get(name, chef_server)
+      end
+      ChefMetal.connect_to_machine(machine_spec, config)
+    end
+
     private
 
     def driver_for_url(driver_url)
@@ -80,15 +89,6 @@ module ChefMetal
       end
     end
 
-    def connect_to_machine(name, chef_server = nil)
-      if name.is_a?(MachineSpec)
-        machine_spec = name
-      else
-        machine_spec = ChefMetal::ChefMachineSpec.get(name, chef_server)
-      end
-      ChefMetal.connect_to_machine(machine_spec, config)
-    end
-
     def keys
       result = (config.keys || {}).dup
       Array(config.key_path) do |key_path|

data/lib/chef_metal/convergence_strategy/precreate_chef_objects.rb

@@ -173,7 +173,7 @@ module ChefMetal
 chef_server_url #{chef_server_url.inspect}
 node_name #{node_name.inspect}
 client_key #{convergence_options[:client_pem_path].inspect}
-ssl_verify_mode :none
+ssl_verify_mode :verify_none
 EOM
       end
     end

data/lib/chef_metal/version.rb

@@ -1,3 +1,3 @@
 module ChefMetal
-  VERSION = '0.11.2'
+  VERSION = '0.12'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chef-metal
 version: !ruby/object:Gem::Version
-  version: 0.11.2
+  version: '0.12'
 platform: ruby
 authors:
 - John Keiser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-04 00:00:00.000000000 Z
+date: 2014-06-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef
@@ -94,34 +94,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.5'
-- !ruby/object:Gem::Dependency
-  name: chef-metal-fog
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.5'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.5'
-- !ruby/object:Gem::Dependency
-  name: chef-metal-vagrant
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.4'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.4'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement