From ed64b5edff15e702493df21aa3230b81593e6133 Mon Sep 17 00:00:00 2001 From: Michael Lando Date: Fri, 9 Jun 2017 03:19:04 +0300 Subject: [SDC-29] catalog 1707 rebase commit. Change-Id: I43c3dc5cf44abf5da817649bc738938a3e8388c1 Signed-off-by: Michael Lando --- sdc-os-chef/sdc-cassandra/startup.sh | 13 ++++++------- 1 file changed, 6 insertions(+), 7 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 89d95ea022..3c001dfbab 100755 --- a/sdc-os-chef/sdc-cassandra/startup.sh +++ b/sdc-os-chef/sdc-cassandra/startup.sh @@ -1,6 +1,10 @@ #!/bin/bash cd /root/chef-solo +mkdir -p /root/chef-solo/cookbooks/cassandra-actions/attributes +echo "normal['version'] = \"${RELEASE}\"" > /root/chef-solo/cookbooks/cassandra-actions/attributes/default.rb +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 @@ -15,14 +19,9 @@ echo "########### starting cassandra ###########" # start cassandra /docker-entrypoint.sh cassandra -f & -chef-solo -c solo.rb -E ${CHEFNAME} +sleep 10 -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 +chef-solo -c solo.rb -E ${CHEFNAME} while true; do sleep 2; done - -- cgit 1.2.3-korg