From 0875ce0faad191c21b32cc9c95ffc20ebd57d586 Mon Sep 17 00:00:00 2001
From: Yuli Shlosberg <ys9693@att.com>
Date: Thu, 25 Jan 2018 13:53:36 +0200
Subject: Cassandra OOM Alignment

Change-Id: If9792919dba17936965b45361888a44a12a76b67
Issue-ID: SDC-911
Signed-off-by: Yuli Shlosberg <ys9693@att.com>
---
 sdc-os-chef/sdc-cassandra/startup.sh | 20 +++++---------------
 1 file changed, 5 insertions(+), 15 deletions(-)

(limited to 'sdc-os-chef/sdc-cassandra/startup.sh')

diff --git a/sdc-os-chef/sdc-cassandra/startup.sh b/sdc-os-chef/sdc-cassandra/startup.sh
index 49edc26130..0daa82ff88 100755
--- a/sdc-os-chef/sdc-cassandra/startup.sh
+++ b/sdc-os-chef/sdc-cassandra/startup.sh
@@ -1,26 +1,16 @@
 #!/bin/bash
 
 cd /root/chef-solo
-echo "normal['HOST_IP'] = \"${HOST_IP}\"" >> /root/chef-solo/cookbooks/cassandra-actions/attributes/default.rb
-
-export CHEFNAME=${ENVNAME}
-
-sed -i "s/HOSTIP/${HOST_IP}/g" /root/chef-solo/cookbooks/cassandra-actions/recipes/02-createCsUser.rb
-sed -i "s/HOSTIP/${HOST_IP}/g" /root/chef-solo/cookbooks/cassandra-actions/recipes/03-createDoxKeyspace.rb
-sed -i "s/HOSTIP/${HOST_IP}/g" /root/chef-solo/cookbooks/cassandra-actions/recipes/04-schemaCreation.rb
-
-chef-solo -c solo.rb -o recipe[cassandra-actions::01-configureCassandra] -E ${CHEFNAME}
+chef-solo -c solo.rb -o recipe[cassandra-actions::01-configureCassandra] -E ${ENVNAME}
 rc=$?
-
 if [[ $rc != 0 ]]; then exit $rc; fi
+
 echo "########### starting cassandra ###########"
 # start cassandra
 /docker-entrypoint.sh cassandra -f &
 
-sleep 10
-
-chef-solo -c solo.rb  -E ${CHEFNAME}
-rc=$?
+chef-solo -c solo.rb  -E ${ENVNAME}
 if [[ $rc != 0 ]]; then exit $rc; fi
-while true; do sleep 2; done
+
+exec "$@";
 
-- 
cgit 1.2.3-korg