Make Cassandra port configurable.

[sdc.git] / sdc-os-chef / sdc-cassandra / chef-repo / cookbooks / cassandra-actions / templates / default / change_cassandra_pass.sh.erb

diff --git a/sdc-os-chef/sdc-cassandra/chef-repo/cookbooks/cassandra-actions/templates/default/change_cassandra_pass.sh.erb b/sdc-os-chef/sdc-cassandra/chef-repo/cookbooks/cassandra-actions/templates/default/change_cassandra_pass.sh.erb
index d1fdcf3..a9d7180 100644 (file)
--- a/sdc-os-chef/sdc-cassandra/chef-repo/cookbooks/cassandra-actions/templates/default/change_cassandra_pass.sh.erb
+++ b/sdc-os-chef/sdc-cassandra/chef-repo/cookbooks/cassandra-actions/templates/default/change_cassandra_pass.sh.erb
@@ -2,14 +2,15 @@
 
 CASSANDRA_PASS=<%= @cassandra_pwd %>
 CASSANDRA_IP=<%= @cassandra_ip %>
+CASSANDRA_PORT=<%= @cassandra_port %>
 
 pass_changed=99
 retry_num=1
 is_up=0
 while [ $is_up -eq 0 -a $retry_num -le 100 ]; do
-   echo "exit" | cqlsh -u cassandra -p cassandra $CASSANDRA_IP  > /dev/null 2>&1
+   echo "exit" | cqlsh -u cassandra -p cassandra $CASSANDRA_IP $CASSANDRA_PORT > /dev/null 2>&1
    res1=$?
-   echo "exit" | cqlsh -u cassandra -p $CASSANDRA_PASS $CASSANDRA_IP  > /dev/null 2>&1
+   echo "exit" | cqlsh -u cassandra -p $CASSANDRA_PASS $CASSANDRA_IP $CASSANDRA_PORT > /dev/null 2>&1
    res2=$?
 
    if [ $res1 -eq 0 -o $res2 -eq 0 ]; then
@@ -24,7 +25,7 @@ done
 
 if [ $res1 -eq 0 -a $res2 -eq 1 -a $is_up -eq 1 ]; then
  echo "Modify cassandra password"
- echo "ALTER USER cassandra WITH PASSWORD '$CASSANDRA_PASS';" | cqlsh -u cassandra -p cassandra $CASSANDRA_IP
+ echo "ALTER USER cassandra WITH PASSWORD '$CASSANDRA_PASS';" | cqlsh -u cassandra -p cassandra $CASSANDRA_IP $CASSANDRA_PORT
 elif [ $res1 -eq 1 -a $res2 -eq 0 -a $is_up -eq 1 ]; then
  echo "cassandra password already modified"
 else exit 1