Remove kibana4 workarounds

- Remove the kibana.yml workaround, now that kibana works again out of the box.
rackspace-cookbooks · May 1, 2015 · cc97347 · cc97347
1 parent 4b6f5c1
commit cc97347
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 30 deletions.
diff --git a/attributes/kibana.rb b/attributes/kibana.rb
@@ -1,6 +1,3 @@
-
-default['elkstack']['kibana4_workaround'] = false
-
 default['kibana']['web_dir'] = '/opt/kibana/current'
 default['kibana']['webserver_port'] = 443
 default['kibana']['webserver_scheme'] = 'https://'

diff --git a/recipes/kibana.rb b/recipes/kibana.rb
@@ -103,9 +103,6 @@
 end
 # end replaces 'kibana::install'
 
-# see https://github.com/rackspace-cookbooks/elkstack/issues/103
-include_recipe 'elkstack::kibana4_workarounds' if node['elkstack']['kibana4_workaround']
-
 # include_recipe 'nginx' # so service[nginx] exists, the one from the LWRP above is not created until runtime
 service 'nginx' do
   action :nothing

diff --git a/recipes/kibana4_workarounds.rb b/recipes/kibana4_workarounds.rb