cfer-provisioning 0.2.0.pre.alpha2 → 0.2.0.pre.alpha3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: edeab00b5081255d343cc3c446fc45c92007c297
-  data.tar.gz: 6242a16f73c8a67c85e97f0f3a2c2ad72f502b86
+  metadata.gz: 2520949babb6365f2733e61d18c71a96a12f5f48
+  data.tar.gz: 08f82cfdaf461eb8ff0ed718d62c1f4002a62334
 SHA512:
-  metadata.gz: 2d9d927e125c78097d532d91fce671aabb2e2f92d4fb9628b8ff71ec7f2b5ae7a0dbff6523f206fe1b524c32f5aabb723af9819d9833a3f80e8b7ec77abcdcc7
-  data.tar.gz: c0909bfdc4a324e13a299a9acf010e4165c52d73ce4d1bd5e128e59353ab5ef74453ecdb0da039eceb155739ec18d33dc9be4559ea23c932c92b5b3b452cc685
+  metadata.gz: 8bd9096d6e34abbcca2f144d4e56904604812fe50db14490ef7036039f11f6829c506dfcb9916994db4606e96a99bc90ed439d87afd3aa8a8068ce3d9b245110
+  data.tar.gz: 8090b41ad1cbc2e9cf4e48f3e02d5680f22021881dd00463b5edc94e4a64567806197526fc975baf80e8a1bcdb55708c7b2c570deba884d53f3edb958450520e

data/lib/cfer/provisioning/chef.rb

@@ -1,5 +1,5 @@
 module Cfer::Provisioning
-  def install_chef_solo_with_cloud_init(options = {})
+  def install_chef_with_cloud_init(options = {})
     # we can't use the cloud-init `chef` module because it expects a server/validator.
 
     cloud_init_bootcmds <<
@@ -77,6 +77,41 @@ module Cfer::Provisioning
     Cfer.cfize(cmd)
   end
 
+  def chef_client(options = {})
+    raise "Chef already configured on this resource" if @chef
+    @chef = true
+
+    raise "must specify chef_server_url" if options[:chef_server_url].nil?
+    raise "must specify validation_client_name" if options[:validation_client_name].nil?
+
+    options[:config_path] ||= '/etc/chef/client.rb'
+    options[:json_path] ||= '/etc/chef/node.json'
+    options[:cookbook_path] ||= '/var/chef/cookbooks'
+    options[:data_bag_path] ||= '/var/chef/data_bags'
+    options[:log_path] ||= '/var/log/chef-client.log'
+
+    options[:service_type] ||= :upstart
+
+    run_set = []
+
+    install_chef_with_cloud_init(options) unless options[:no_install]
+
+    add_write_chef_json(options)
+    run_set << :write_chef_json
+
+    cfn_init_config :run_chef_client do
+      client_rb = Erubis::Eruby.new(IO.read("#{__dir__}/client.rb.erb")).result(options: options)
+
+      file options[:config_path], content: Cfer.cfize(options[:client_rb] || client_rb),
+        mode: '000400', owner: 'root', group: 'root'
+
+      command :'00_run_chef_once', 'chef-client --once'
+    end
+    run_set << :run_chef_client
+
+    cfn_init_config_set :run_chef_client, run_set
+  end
+
   def chef_solo(options = {})
     raise "Chef already configured on this resource" if @chef
     @chef = true
@@ -89,7 +124,7 @@ module Cfer::Provisioning
     options[:data_bag_path] ||= '/var/chef/data_bags'
     options[:log_path] ||= '/var/log/chef-solo.log'
 
-    install_chef_solo_with_cloud_init(options) unless options[:no_install]
+    install_chef_with_cloud_init(options) unless options[:no_install]
 
     if must_install_berkshelf
       install_berkshelf(options) if must_install_berkshelf # places cloud-init runners
@@ -107,10 +142,7 @@ module Cfer::Provisioning
       run_set << :run_berkshelf
     end
 
-    cfn_metadata['CferExt::Provisioning::Chef'] = options[:json] || {}
-    cfn_init_config :write_chef_json do
-      command :write_chef_json, build_write_json_cmd(options[:json_path])
-    end
+    add_write_chef_json(options)
     run_set << :write_chef_json
 
     cfn_init_config :run_chef_solo do
@@ -124,15 +156,7 @@ module Cfer::Provisioning
       file options[:config_path], content: options[:solo_rb] || solo_rb,
         mode: '000400', owner: 'root', group: 'root'
 
-      run_list = options[:run_list] || []
-
-      chef_cmd = "chef-solo -c '#{options[:config_path]}' -j '#{options[:json_path]}'"
-      chef_cmd << " -o '#{options[:run_list].join(',')}'" unless options[:run_list].empty?
-
-      file '/usr/local/bin/run-chef-solo.bash', content: chef_cmd,
-        mode: '000500', owner: 'root', group: 'root'
-
-      command :run_chef, 'bash /usr/local/bin/run-chef-solo.bash'
+      command :run_chef, 'chef-solo'
     end
     run_set << :run_chef_solo
 
@@ -140,5 +164,14 @@ module Cfer::Provisioning
   end
 
   private
+  def add_write_chef_json(options)
+    options[:run_list] ||= []
+    options[:json] ||= {}
+
+    cfn_metadata['CferExt::Provisioning::Chef'] = options[:json].merge(run_list: options[:run_list])
+    cfn_init_config :write_chef_json do
+      command :write_chef_json, build_write_json_cmd(options[:json_path])
+    end
+  end
 end
 

data/lib/cfer/provisioning/client.rb.erb

@@ -0,0 +1,22 @@
+chef_server_url                           '<%= options[:chef_server_url] %>'
+validation_client_name                    '<%= options[:validation_client_name] %>'
+log_level                                 <%= (options[:log_level] || :info).inspect %>
+log_location                              '<%= options[:log_path] %>'
+json_attribs                              '<%= options[:json_path] %>'
+cookbook_path                             '<%= options[:cookbook_path] %>'
+
+<%- case options[:node_name]
+    when nil -%>
+<%- when :hostname -%>
+  node_name                               `hostname`.strip
+<%- else -%>
+  node_name '<%= options[:node_name] %>'
+<%- end %>
+
+<%- unless options[:environment].nil? -%>
+  environment                             '<%= options[:environment] %>'
+<%- end -%>
+
+<%- unless options[:validation_key].nil? -%>
+  validation_key                          '<%= options[:validation_key] %>'
+<%- end -%>

data/lib/cfer/provisioning/version.rb

@@ -1,5 +1,5 @@
 module Cfer
   module Provisioning
-    VERSION = "0.2.0-alpha2"
+    VERSION = "0.2.0-alpha3"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cfer-provisioning
 version: !ruby/object:Gem::Version
-  version: 0.2.0.pre.alpha2
+  version: 0.2.0.pre.alpha3
 platform: ruby
 authors:
 - Sean Edwards
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-07-16 00:00:00.000000000 Z
+date: 2016-07-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -115,6 +115,7 @@ files:
 - lib/cfer/provisioning/cfn-bootstrap.bash.erb
 - lib/cfer/provisioning/cfn-bootstrap.rb
 - lib/cfer/provisioning/chef.rb
+- lib/cfer/provisioning/client.rb.erb
 - lib/cfer/provisioning/cloud-init.rb
 - lib/cfer/provisioning/extensions.rb
 - lib/cfer/provisioning/version.rb