diff --git a/.gitignore b/.gitignore index 05a1be4..9acbe5d 100644 --- a/.gitignore +++ b/.gitignore @@ -2,4 +2,7 @@ /cookbooks /tmp /.bundle/ -/vendor/ \ No newline at end of file +/vendor/ +/cookbooks/ +/tmp/librarian/ +/.chef/ \ No newline at end of file diff --git a/Gemfile b/Gemfile index 11fa1af..fa98cb3 100644 --- a/Gemfile +++ b/Gemfile @@ -2,3 +2,4 @@ source "https://rubygems.org" gem "knife-solo" gem "librarian" +gem "librarian-chef" diff --git a/Gemfile.lock b/Gemfile.lock index 9c13855..e686bb3 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -2,7 +2,7 @@ GEM remote: https://rubygems.org/ specs: archive-tar-minitar (0.5.2) - chef (11.4.0) + chef (11.6.0) erubis highline (>= 1.6.9) json (>= 1.4.4, <= 1.7.7) @@ -17,32 +17,34 @@ GEM rest-client (>= 1.0.4, < 1.7.0) yajl-ruby (~> 1.1) erubis (2.7.0) - highline (1.6.16) + highline (1.6.19) ipaddress (0.8.0) json (1.7.7) - knife-solo (0.2.0) + knife-solo (0.3.0) chef (>= 10.12) - librarian (~> 0.0.20) + erubis (~> 2.7.0) net-ssh (>= 2.2.2, < 3.0) - librarian (0.0.26) - archive-tar-minitar (>= 0.5.2) - chef (>= 0.10) + librarian (0.1.0) highline thor (~> 0.15) - mime-types (1.21) + librarian-chef (0.0.1) + archive-tar-minitar (>= 0.5.2) + chef (>= 0.10) + librarian (~> 0.1.0) + mime-types (1.23) mixlib-authentication (1.3.0) mixlib-log mixlib-cli (1.3.0) mixlib-config (1.1.2) - mixlib-log (1.4.1) - mixlib-shellout (1.1.0) - net-ssh (2.6.6) + mixlib-log (1.6.0) + mixlib-shellout (1.2.0) + net-ssh (2.6.8) net-ssh-gateway (1.2.0) net-ssh (>= 2.6.5) net-ssh-multi (1.1) net-ssh (>= 2.1.4) net-ssh-gateway (>= 0.99.0) - ohai (6.16.0) + ohai (6.18.0) ipaddress mixlib-cli mixlib-config @@ -53,7 +55,7 @@ GEM rest-client (1.6.7) mime-types (>= 1.16) systemu (2.5.2) - thor (0.17.0) + thor (0.18.1) yajl-ruby (1.1.0) PLATFORMS @@ -62,3 +64,4 @@ PLATFORMS DEPENDENCIES knife-solo librarian + librarian-chef diff --git a/solo.rb b/solo.rb deleted file mode 100644 index ac797fc..0000000 --- a/solo.rb +++ /dev/null @@ -1,6 +0,0 @@ -file_cache_path "/tmp/chef-solo" -data_bag_path "/tmp/chef-solo/data_bags" -encrypted_data_bag_secret "/tmp/chef-solo/data_bag_key" -cookbook_path [ "/tmp/chef-solo/cookbooks", - "/tmp/chef-solo/site-cookbooks" ] -role_path "/tmp/chef-solo/roles"