From c120666439c6eee238e31a01ee9de91d1fa821f8 Mon Sep 17 00:00:00 2001 From: Yuli Shlosberg Date: Tue, 27 Feb 2018 10:38:48 +0200 Subject: ES OOM alignment Change-Id: I2f9321dcd9603cbb38d840efe9dc46fb0772e785 Issue-ID: SDC-915 Signed-off-by: Yuli Shlosberg --- .../cookbooks/cassandra-actions/recipes/03-prepareProbeFile.rb | 7 ------- .../cassandra-actions/templates/default/ready-probe.sh.erb | 2 -- 2 files changed, 9 deletions(-) (limited to 'sdc-os-chef/sdc-cassandra/chef-repo/cookbooks') diff --git a/sdc-os-chef/sdc-cassandra/chef-repo/cookbooks/cassandra-actions/recipes/03-prepareProbeFile.rb b/sdc-os-chef/sdc-cassandra/chef-repo/cookbooks/cassandra-actions/recipes/03-prepareProbeFile.rb index 3d722021da..c196ca7b94 100644 --- a/sdc-os-chef/sdc-cassandra/chef-repo/cookbooks/cassandra-actions/recipes/03-prepareProbeFile.rb +++ b/sdc-os-chef/sdc-cassandra/chef-repo/cookbooks/cassandra-actions/recipes/03-prepareProbeFile.rb @@ -14,11 +14,4 @@ template "/var/lib/ready-probe.sh" do :cassandra_ip => application_host, :cassandra_pwd => ENV['CS_PASSWORD'] }) -end - - -bash "run_probe_script" do - code <<-EOH - /var/lib/ready-probe.sh - EOH end \ No newline at end of file diff --git a/sdc-os-chef/sdc-cassandra/chef-repo/cookbooks/cassandra-actions/templates/default/ready-probe.sh.erb b/sdc-os-chef/sdc-cassandra/chef-repo/cookbooks/cassandra-actions/templates/default/ready-probe.sh.erb index 25dfbf66a6..2f97d0768e 100644 --- a/sdc-os-chef/sdc-cassandra/chef-repo/cookbooks/cassandra-actions/templates/default/ready-probe.sh.erb +++ b/sdc-os-chef/sdc-cassandra/chef-repo/cookbooks/cassandra-actions/templates/default/ready-probe.sh.erb @@ -1,7 +1,5 @@ #!/bin/bash -set -x - CASSANDRA_PASS=<%= @cassandra_pwd %> CASSANDRA_IP=<%= @cassandra_ip %> -- cgit 1.2.3-korg