toquen 1.0.1 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8703dab7d98090f0909462f56db13a6c0a84fd7e
-  data.tar.gz: a33ae98ea6f1d5608a26aee39e5852617d2e169f
+  metadata.gz: 03245820adba3a998f96cd66ced0c2a9613b891a
+  data.tar.gz: 3794fb563b8e172655e5d3829de4dd4c78c8fb3f
 SHA512:
-  metadata.gz: 8c7d68c25b2793422379e67c9e0e371648346d207eb51da1a868c796be3e755eac8b9a4f293feb3725c7001d929c057368d98eab35d75b0754a51222153897bf
-  data.tar.gz: 1595de9ad4cabcbe322cdf0dde7dc100731cff11fdceba38311d2146fa12704ffb03a8987bbe8494b10592cfc3d046a08ca3b95420ce6bc712c411c45ee42a35
+  metadata.gz: b06c9e073d2cbd3dad11ab8525e946a9e6196819e43b199cf386187026f5b4c763029dc47c018cb798a72d1c33fcd6455f5ffab361b4aa029c331a23a26a142c
+  data.tar.gz: 91ff2004da7c0c5c2422acbc0dab97f6bcca2a58ba77e6839dd530dba7ac5175476bcd1d8a689cbfbcf5f8b9faa2d516c846ae671b650f16d06642832cc70aeb

data/README.md

@@ -1,10 +1,10 @@
 # Toquen
 ![A Toque](http://upload.wikimedia.org/wikipedia/commons/thumb/b/bc/William_Orpen_Le_Chef_de_l%27H%C3%B4tel_Chatham%2C_Paris.jpg/97px-William_Orpen_Le_Chef_de_l%27H%C3%B4tel_Chatham%2C_Paris.jpg)
 
-**Toquen** combines [Capistrano 3](http://www.capistranorb.com), [Chef](http://www.getchef.com), and [AWS instance tags](http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/Using_Tags.html) into one bundle of joy.  Instance roles are stored in AWS tags and **Toquen** can suck those out, put them into data bags for chef, and create stages in capistrano.  You can then selectively run chef on individual servers or whole roles that contain many servers with simple commands.
+**Toquen** combines [Capistrano 3](http://www.capistranorb.com), [Chef](http://www.getchef.com), and [AWS instance tags](http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/Using_Tags.html) into one bundle of joy.  Instance roles are stored in AWS tags and **Toquen** can suck those out, put them into node descriptions for chef, and create stages in capistrano.  You can then selectively run chef on individual servers or whole roles that contain many servers with simple commands.
 
 ## Installation
-Before beginning, you should already understand how [chef-solo](http://docs.opscode.com/chef_solo.html) works and have some cookbooks, roles defined, and at least a folder for data_bags (even if it's empty).  The rest of this guide assumes you have these ready as well as an AWS PEM key and [access credentials](http://docs.aws.amazon.com/AWSSimpleQueueService/latest/SQSGettingStartedGuide/AWSCredentials.html).
+Before beginning, you should already understand how [chef](https://docs.chef.io) works and have some cookbooks, roles defined, and at least a folder for data_bags (even if it's empty).  Toquen uses the chef-client in [local mode](https://docs.chef.io/ctl_chef_client.html#run-in-local-mode), which is worth understanding before diving into Toquen.  The rest of this guide assumes you have these ready as well as an AWS PEM key and [access credentials](http://docs.aws.amazon.com/AWSSimpleQueueService/latest/SQSGettingStartedGuide/AWSCredentials.html).
 
 Generally, it's easiest if you start off in an empty directory.  First, create a file named *Gemfile* that contains these lines:
 
@@ -33,10 +33,10 @@ Then, in AWS, create an [AWS instance tag](http://docs.aws.amazon.com/AWSEC2/lat
 Then, run:
 
 ```shell
-cap update_roles
+cap update_nodes
 ```
 
-This will create a data_bag named *servers* in your data_bags path that contains one item per server name, as well as create stages per server and role for use in capistrano.
+This will write server information from AWS to [chef node](https://docs.chef.io/nodes.html) files and will create stages per server and role for use in capistrano.  By writing server information to node files, you'll be able to use [search](https://docs.chef.io/chef_search.html) in your recipes, allowing you to reference other nodes' locations and other metadata.
 
 ## Server Bootstrapping
 Bootstrapping a server will perform all of the following:
@@ -67,8 +67,8 @@ cap all bootstrap
 
 A lockfile is created after the first bootstrapping so that the full bootstrap process is only run once per server.
 
-## Running Chef-Solo
-You can run chef-solo for a single server by using:
+## Running the Chef Client
+You can run chef for a single server by using:
 
 ```shell
 cap server-<server name> cook
@@ -86,14 +86,14 @@ Or on all servers:
 cap all cook
 ```
 
-## Updating Roles
-If you change the roles of any servers on AWS (or add any new ones) you will need to run:
+## Updating Node Information
+If you change the roles (or any other metadata / ip addresses / etc) for any servers on AWS (or add any new ones) you will need to run:
 
 ```shell
-cap update_roles
+cap update_nodes
 ```
 
-This will update the *servers* data_bag as well as the capistrano stages.
+This will update the local node information cache as well as the capistrano stages.
 
 ## Additional Configuration
 If you want to use a different tag name (or you like commas as a delimiter) you can specify your own role extractor/setter by placing the following in either your Capfile or config/deploy.rb:

data/lib/toquen/capistrano.rb

@@ -5,8 +5,8 @@ require 'json'
 
 set :chef_upload_location, -> { "/home/#{fetch(:ssh_options)[:user]}" }
 
-desc "update local cache of servers and roles"
-task :update_roles do
+desc "update local cache of nodes and roles"
+task :update_nodes do
   load Pathname.new fetch(:deploy_config_path, 'config/deploy.rb')
   roles = Hash.new([])
   servers = []
@@ -15,7 +15,7 @@ task :update_roles do
   aws.server_details.each do |details|
     details[:roles].each { |role| roles[role] += [details] }
     roles['all'] += [details]
-    Toquen::LocalWriter.create_databag_item details
+    Toquen::LocalWriter.create_node details
     Toquen::LocalWriter.create_stage "server-#{details[:name]}", [details]
     servers << details[:name]
   end
@@ -97,22 +97,23 @@ task :update_kitchen do
 
   run_locally do
     info "Building kitchen locally..."
-    execute [
-      "rm -rf #{lkitchen}",
-      "mkdir -p #{lkitchen}",
-      "ln -s #{File.expand_path(fetch(:chef_cookbooks_path))} #{lkitchen}",
-      "ln -s #{File.expand_path(fetch(:chef_data_bags_path))} #{lkitchen}",
-      "ln -s #{File.expand_path(fetch(:chef_roles_path))} #{lkitchen}",
-      "ln -s #{File.expand_path(fetch(:chef_environments_path))} #{lkitchen}"
-    ].join(" && ")
+    execute :rm, "-rf", lkitchen
+    execute :mkdir, "-p", lkitchen
+    %W(cookbooks data_bags roles environments nodes).each do |dname|
+      source = File.expand_path fetch("chef_#{dname}_path".intern)
+      execute :ln, "-s", source, File.join(lkitchen, dname)
+    end
   end
 
   open("#{lkitchen}/chef_config.rb", 'w') { |f|
-    f.write("file_cache_path '/var/chef-solo'\n")
     f.write("cookbook_path '#{kitchen}/cookbooks'\n")
-    f.write("data_bag_path '#{kitchen}/data_bags'\n")
     f.write("role_path '#{kitchen}/roles'\n")
-    f.write("ssl_verify_mode :verify_peer\n")
+    f.write("data_bag_path '#{kitchen}/data_bags'\n")
+    f.write("environment_path '#{kitchen}/environments'\n")
+    f.write("node_path '#{kitchen}/nodes'\n")
+    f.write("log_level :#{fetch(:chef_log_level)}\n")
+    f.write("cache_path '/tmp/chef_cache'\n")
+    f.write("local_mode 'true'\n")
   }
 
   on roles(:all), in: :parallel do |host|
@@ -129,17 +130,9 @@ desc "Run chef for servers"
 task :cook do
   on roles(:all), in: :parallel do |host|
     info "Chef is now cooking on #{host}..."
-    env = host.properties.environment
-    roles = host.properties.roles.reject { |r| r.to_s.start_with?('server-') or r == :all }
-    roles = roles.map { |r| "\"role[#{r}]\"" }.join(',')
-    info "Roles for #{host}: #{roles}"
-    tfile = "chef.json"
-    upload! StringIO.new("{ \"run_list\": [ #{roles} ] }"), tfile
     within fetch(:chef_upload_location) do
-      args = ["-c #{fetch(:chef_upload_location)}/kitchen/chef_config.rb"]
-      args += ["-j #{tfile}"]
-      args += ["--environment #{env}"] unless env.nil?
-      execute "sudo chef-solo #{args.join(' ')}"
+      config = "#{fetch(:chef_upload_location)}/kitchen/chef_config.rb"
+      execute "sudo chef-client -c #{config}"
     end
   end
 end
@@ -256,7 +249,7 @@ module Capistrano
   module TaskEnhancements
     alias_method :original_default_tasks, :default_tasks
     def default_tasks
-      original_default_tasks + %w{toquen_install update_roles}
+      original_default_tasks + %w{toquen_install update_nodes}
     end
   end
 end

data/lib/toquen/local_writer.rb

@@ -1,10 +1,17 @@
 module Toquen
   module LocalWriter
-    def self.create_databag_item(details)
-      servers = "#{fetch(:chef_data_bags_path)}/servers"
-      FileUtils.mkdir_p servers
-      open("#{servers}/#{details[:name]}.json", 'w') do |f|
-        f.write JSON.dump(details)
+    def self.create_node(details)
+      FileUtils.mkdir_p fetch(:chef_nodes_path)
+      path = File.join(fetch(:chef_nodes_path), "#{details[:name]}.json")
+      existing = File.exists?(path) ? JSON.parse(File.read(path)) : {}
+      open(path, 'w') do |f|
+        node = {
+          name: details[:name],
+          chef_environment: details[:environment],
+          normal: { toquen: details },
+          run_list: details[:roles].map { |r| "role[#{r}]" }
+        }.merge(existing)
+        f.write JSON.pretty_generate(node)
       end
     end
 

data/lib/toquen/templates/deploy.rb

@@ -9,10 +9,14 @@ set :aws_secret_access_key, nil
 # each server.
 set :ssh_options, { :keys => ["./mykey.pem"], :user => "ubuntu" }
 
-# Set the location of your cookbooks/data bags/roles for Chef
+# Set the location of your cookbooks/data bags/roles/nodes for Chef
 set :chef_cookbooks_path, 'kitchen/cookbooks'
 set :chef_data_bags_path, 'kitchen/data_bags'
 set :chef_roles_path, 'kitchen/roles'
+set :chef_nodes_path, 'kitchen/nodes'
 
 # this directory should exist, even if empty
 set :chef_environments_path, 'kitchen/environment'
+
+# log level for chef
+set :chef_log_level, :warn

data/lib/toquen/templates/ubuntu_bootstrap.erb

@@ -12,9 +12,12 @@ DEBIAN_FRONTEND=noninteractive
 apt-get -y update && apt-get -y install software-properties-common
 apt-add-repository -y ppa:brightbox/ruby-ng
 
-# update apt, install ruby 2.3, upgrade everything
+# update apt, install ruby 2.2, upgrade everything
+# note: ruby2.3 is available, but shouldn't be installed
+#       until https://github.com/chef/chef/issues/4359 gets
+#       into a release version.
 apt-get -y update
-apt-get -y install build-essential ruby2.3 ruby2.3-dev
+apt-get -y install build-essential ruby2.2 ruby2.2-dev
 apt-get -y upgrade && apt-get -y dist-upgrade
 
 # install chef

data/lib/toquen/version.rb

@@ -1,3 +1,3 @@
 module Toquen
-  VERSION = "1.0.1"
+  VERSION = "2.0.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: toquen
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 2.0.0
 platform: ruby
 authors:
 - Brian Muller
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-27 00:00:00.000000000 Z
+date: 2016-07-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano