diff --git a/Berksfile.lock b/Berksfile.lock index 9f622b4..045dbe7 100644 --- a/Berksfile.lock +++ b/Berksfile.lock @@ -1,7 +1,7 @@ DEPENDENCIES chef-ingredient git: https://github.com/chef-cookbooks/chef-ingredient.git - revision: 060e429fe92c312a6495e840ca6a7caee98d3085 + revision: 215873838e420fb6760cd5a8055cedc90ed74e4e branch: master chef-server-12 path: vendor/chef-server-12 @@ -21,7 +21,7 @@ GRAPH apt-chef (0.1.0) apt (>= 0.0.0) build-essential (2.2.3) - chef-ingredient (0.9.0) + chef-ingredient (0.9.1) apt-chef (>= 0.0.0) yum-chef (>= 0.0.0) chef-server-12 (0.1.7) diff --git a/recipes/analytics.rb b/recipes/analytics.rb index aec2c5b..891ada3 100644 --- a/recipes/analytics.rb +++ b/recipes/analytics.rb @@ -20,23 +20,15 @@ # limitations under the License. # -directory '/etc/opscode' do - recursive true -end - -directory '/etc/opscode-analytics' do - recursive true -end - -file '/etc/opscode-analytics/opscode-analytics.rb' do - content <<-EOF +chef_ingredient 'analytics' do + config <<-EOF topology 'standalone' analytics_fqdn '#{node['delivery-cluster']['analytics']['fqdn']}' features['integration'] = #{node['delivery-cluster']['analytics']['features']} - EOF - notifies :reconfigure, 'chef_server_ingredient[opscode-analytics]' +EOF + action :install end -chef_ingredient 'analytics' do +ingredient_config 'analytics' do notifies :reconfigure, 'chef_ingredient[analytics]' end diff --git a/spec/unit/libraries/helpers_chef_server_spec.rb b/spec/unit/libraries/helpers_chef_server_spec.rb index 6b8d17e..7d7b31a 100644 --- a/spec/unit/libraries/helpers_chef_server_spec.rb +++ b/spec/unit/libraries/helpers_chef_server_spec.rb @@ -30,7 +30,7 @@ 'api_fqdn' => 'chef-server.chef.io', 'store_keys_databag' => false, 'plugin' => { - 'opscode-reporting' => true + 'reporting' => true } } end diff --git a/vendor/chef-server-12/recipes/default.rb b/vendor/chef-server-12/recipes/default.rb index 4baf3b2..b94dd76 100644 --- a/vendor/chef-server-12/recipes/default.rb +++ b/vendor/chef-server-12/recipes/default.rb @@ -30,14 +30,12 @@ recursive true end -chef_ingredient 'chef-server' do - notifies :reconfigure, 'chef_ingredient[chef-server]' -end +chef_ingredient 'chef-server' template "/etc/opscode/chef-server.rb" do owner "root" mode "0644" - notifies :run, "execute[reconfigure chef]", :immediately + notifies :reconfigure, "chef_ingredient[chef-server]", :immediately end execute "reconfigure chef" do