diff --git a/libraries/install.rb b/libraries/install.rb index 6163618..21288d8 100644 --- a/libraries/install.rb +++ b/libraries/install.rb @@ -69,7 +69,7 @@ class Provider::KibanaInstall < Chef::Provider::LWRPBase # ~FC057, ~FC058 link "#{kb_args[:install_dir]}/current" do to "#{kb_args[:install_dir]}/#{kb_args[:git_branch]}/src" end - node.set['kibana'][kb_args[:name]]['web_dir'] = "#{kb_args[:install_dir]}/current/src" + node.default['kibana'][kb_args[:name]]['web_dir'] = "#{kb_args[:install_dir]}/current/src" when 'file' @run_context.include_recipe 'libarchive::default' @@ -96,7 +96,7 @@ class Provider::KibanaInstall < Chef::Provider::LWRPBase # ~FC057, ~FC058 to "#{kb_args[:install_dir]}/kibana-#{kb_args[:version]}" end - node.set['kibana'][kb_args[:name]]['web_dir'] = "#{kb_args[:install_dir]}/current" + node.default['kibana'][kb_args[:name]]['web_dir'] = "#{kb_args[:install_dir]}/current" node.save unless Chef::Config[:solo] end end # end case diff --git a/libraries/web.rb b/libraries/web.rb index 7bb27f4..b494545 100644 --- a/libraries/web.rb +++ b/libraries/web.rb @@ -39,10 +39,10 @@ class Provider::KibanaWeb < Chef::Provider::LWRPBase # ~FC057, ~FC058 case resources[:type] when 'apache' - node.set['apache']['default_site_enabled'] = resources[:default_site_enabled] + node.default['apache']['default_site_enabled'] = resources[:default_site_enabled] - node.set['apache']['listen_ports'] = [] unless resources[:default_site_enabled] - node.set['apache']['listen_ports'] << resources[:listen_port] + node.default['apache']['listen_ports'] = [] unless resources[:default_site_enabled] + node.default['apache']['listen_ports'] << resources[:listen_port] %w(apache2 apache2::mod_dir apache2::mod_proxy apache2::mod_proxy_http).each do |recipe| @run_context.include_recipe recipe @@ -64,8 +64,8 @@ class Provider::KibanaWeb < Chef::Provider::LWRPBase # ~FC057, ~FC058 end when 'nginx' - node.set['nginx']['default_site_enabled'] = resources[:default_site_enabled] - node.set['nginx']['install_method'] = node['kibana']['nginx']['install_method'] + node.default['nginx']['default_site_enabled'] = resources[:default_site_enabled] + node.default['nginx']['install_method'] = node['kibana']['nginx']['install_method'] @run_context.include_recipe 'chef_nginx' template "#{node['nginx']['dir']}/sites-available/#{resources[:name]}" do diff --git a/recipes/install.rb b/recipes/install.rb index 9bbedd1..d750d62 100644 --- a/recipes/install.rb +++ b/recipes/install.rb @@ -22,7 +22,7 @@ unless Chef::Config[:solo] es_server_results = search(:node, "roles:#{node['kibana']['es_role']} AND chef_environment:#{node.chef_environment}") unless es_server_results.empty? - node.set['kibana']['es_server'] = es_server_results[0]['ipaddress'] + node.default['kibana']['es_server'] = es_server_results[0]['ipaddress'] end end diff --git a/test/unit/spec/default_spec.rb b/test/unit/spec/default_spec.rb index 11e6a41..0464b5f 100644 --- a/test/unit/spec/default_spec.rb +++ b/test/unit/spec/default_spec.rb @@ -8,7 +8,7 @@ let(:node) { runner.node } let(:chef_run) do # runner.node.set['logstash'] ... - runner.node.set['kibana']['legacy_mode'] = 'false' + runner.node.default['kibana']['legacy_mode'] = 'false' runner.node.automatic['memory']['total'] = '1024kB' runner.converge(described_recipe) end diff --git a/test/unit/spec/install_spec.rb b/test/unit/spec/install_spec.rb index 86e33c6..6ddf77c 100644 --- a/test/unit/spec/install_spec.rb +++ b/test/unit/spec/install_spec.rb @@ -7,19 +7,19 @@ let(:runner) { ChefSpec::ServerRunner.new(::UBUNTU_OPTS) } let(:node) { runner.node } let(:chef_run) do - # runner.node.set['logstash'] ... - runner.node.set['kibana']['user'] = 'kibanana' - runner.node.set['kibana']['install_dir'] = '/opt/kibanana' - runner.node.set['kibana']['install_type'] = 'file' - runner.node.set['kibana']['config_template'] = 'config.js.erb' - runner.node.set['kibana']['config_cookbook'] = 'kibana' - runner.node.set['kibana']['webserver'] = 'nginx' - runner.node.set['kibana']['es_server'] = '127.0.0.1' - runner.node.set['kibana']['nginx']['template'] = 'kibana-nginx.conf.erb' - runner.node.set['kibana']['nginx']['template_cookbook'] = 'kibana' - runner.node.set['kibana']['nginx']['enable_default_site'] = false - runner.node.set['kibana']['nginx']['install_method'] = 'package' - runner.node.set['kibana']['service']['options']['sv_timeout'] = 42 + # runner.node.default['logstash'] ... + runner.node.default['kibana']['user'] = 'kibanana' + runner.node.default['kibana']['install_dir'] = '/opt/kibanana' + runner.node.default['kibana']['install_type'] = 'file' + runner.node.default['kibana']['config_template'] = 'config.js.erb' + runner.node.default['kibana']['config_cookbook'] = 'kibana' + runner.node.default['kibana']['webserver'] = 'nginx' + runner.node.default['kibana']['es_server'] = '127.0.0.1' + runner.node.default['kibana']['nginx']['template'] = 'kibana-nginx.conf.erb' + runner.node.default['kibana']['nginx']['template_cookbook'] = 'kibana' + runner.node.default['kibana']['nginx']['enable_default_site'] = false + runner.node.default['kibana']['nginx']['install_method'] = 'package' + runner.node.default['kibana']['service']['options']['sv_timeout'] = 42 runner.node.automatic['memory']['total'] = '1024kB' runner.converge(described_recipe) end