shiplane_bootstrappers_chef 0.2.3 → 0.2.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 408457ed820a25b86fa9bbdaf43d02aa8995280f3b4cc5191d755726260f698a
-  data.tar.gz: 4a95a658ba3fd90a01a7782f27fcce908d86cf6ee630e4f6089ed3890bb4a3b4
+  metadata.gz: c38ecfec8ef15b16e5610302a23bbf22d358118aa0106a5bc25b55d18daa679c
+  data.tar.gz: bd3e3506e64e3fe7ba3e9e0fa90e3fbe82317a6f1341aba20c1779f07ae0a3ab
 SHA512:
-  metadata.gz: 7abb9ba612dd9d933676eca88daeb06145151c59e8a97108fc3bbc89dc02859a9ea7907321195a21a675461a1680e7a478222bc809d40d344b1bf51b4170dec5
-  data.tar.gz: 868ed925c554f1b40554132e8bc1bdda19f512f412c40ade73d4cf11a4c6d892a2295859979d5730519a37556dfb400168452f2d63b1bb3f69723076f02622a2
+  metadata.gz: c0b89898f53900760373c7309ab024159cd5f03ad094a971ad7ccc81a0817ab2f0e60f14be014c9d5d48512b270e94b037751096d91ba6c04ccf15772b084965
+  data.tar.gz: d9182ca1def9660381a4d27b695886a751ed2ae309eaebb2c37765da530fca1532ff38e4a8039c6082ad5a5376f3ccf1c3bdffab55a5761fb4c63d6d9d43e2db

data/lib/capistrano/chef_host.rb

@@ -60,11 +60,12 @@ module Shiplane
     def configure
       with_context do
         errors = {}
+        SSHKit.config.default_env["CHEF_LICENSE"] = "accept"
         SSHKit::Coordinator.new(host).each in: :parallel do |h|
           context_variables = fetch(:shiplane_sshkit_values)
 
           begin
-            execute :sudo, 'chef-solo', '-c', "#{Shiplane::ChefHost::REMOTE_CHEF_FOLDER_PATH}/solo.rb", "--chef-license", "accept", interaction_handler: context_variables[:interaction_handler]
+            execute :sudo, 'chef-solo', '-c', "#{Shiplane::ChefHost::REMOTE_CHEF_FOLDER_PATH}/solo.rb", interaction_handler: context_variables[:interaction_handler]
           rescue => e
             errors["#{h}"] = Shiplane::ChefErrorParser.parse(e)
           end

data/lib/capistrano/tasks/bootstrap.rake

@@ -22,7 +22,11 @@ namespace :shiplane do
     # end
 
     task :evaluate_erb_files, :username, :keypath do |task, args|
-      Dotenv.load Shiplane::ChefHost.env_file
+      dotenv_filename = Shiplane::ChefHost.env_file
+      dotenv_filename = "#{dotenv_filename}.#{fetch(:stage)}" if File.exist?("#{dotenv_filename}.#{fetch(:stage)}")
+
+      Dotenv.load dotenv_filename
+
       on fetch(:shiplane_hosts).map(&:capistrano_role) do |host|
         @shiplane_users = [
           "docker",

data/lib/shiplane/bootstrappers/chef/version.rb

@@ -3,7 +3,7 @@
 module Shiplane
   module Bootstrappers
     module Chef
-      VERSION = "0.2.3"
+      VERSION = "0.2.7"
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shiplane_bootstrappers_chef
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.7
 platform: ruby
 authors:
 - John Epperson
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-05-02 00:00:00.000000000 Z
+date: 2021-10-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano