Upgrade to Cassandra 3

[sdc.git] / 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 89d95ea..c779e37 100755 (executable)
--- a/sdc-os-chef/sdc-cassandra/startup.sh
+++ b/sdc-os-chef/sdc-cassandra/startup.sh
@@ -1,28 +1,17 @@
 #!/bin/bash
 
 cd /root/chef-solo
-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 &
 
-chef-solo -c solo.rb  -E ${CHEFNAME}
+echo "########### starting cassandra ###########"
 
-cd /tmp/
-/tmp/create_cassandra_user.sh
-/tmp/create_dox_keyspace.sh
-/bin/chmod +x sdctool/scripts/*.sh
-./sdctool/scripts/schemaCreation.sh /tmp/sdctool/config
+/docker-entrypoint.sh cassandra -f &
 
-while true; do sleep 2; done
+chef-solo -c solo.rb  -E ${ENVNAME}
+rc=$?
+if [[ $rc != 0 ]]; then exit $rc; fi
+while true; do sleep 30; done