Skip to content

Removing git conflict markers from the start.sh script #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
deepak-gittyup wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Removing git conflict markers from the start.sh script #3

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 2 additions & 16 deletions start.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,13 +75,8 @@ terraform-gcp-provisioner() {
export SOLR_STARTUP_PARAMS=`jq -r '."cluster"."startup-params"' $CONFIGFILE`
export ZK_NODE=`terraform output -state=terraform/terraform.tfstate -json zookeeper_details|jq '.[] | .name'`
export ZK_NODE=${ZK_NODE//\"/}
<<<<<<< HEAD
export ZK_TARBALL_NAME="apache-zookeeper-3.6.1-bin.tar.gz"
export ZK_TARBALL_PATH="$ORIG_WORKING_DIR/apache-zookeeper-3.6.1-bin.tar.gz"
=======
export ZK_TARBALL_NAME="apache-zookeeper-3.6.3-bin.tar.gz"
export ZK_TARBALL_PATH="$ORIG_WORKING_DIR/apache-zookeeper-3.6.3-bin.tar.gz"
>>>>>>> stress-harness
export JDK_TARBALL=`jq -r '."cluster"."jdk-tarball"' $CONFIGFILE`
export BENCH_USER="solruser"
export BENCH_KEY="terraform/id_rsa"
Expand All @@ -107,7 +102,7 @@ vagrant-provisioner() {
export ZK_NODE_COUNT=1

export JDK_TARBALL=`jq -r '."cluster"."jdk-tarball"' $CONFIGFILE`
export ZK_TARBALL_NAME="apache-zookeeper-3.6.1-bin.tar.gz"
export ZK_TARBALL_NAME="apache-zookeeper-3.6.3-bin.tar.gz"

echo_blue "Solr servers: $SOLR_NODE_COUNT"
bash -c 'printf "["; for ((i=1; i<$SOLR_NODE_COUNT; i++)); do printf "$i,"; done; printf $SOLR_NODE_COUNT; printf "]"' | jq 'map({"name":("solr-"+(.|tostring)), "ip": ("192.168.5."+((.+100)|tostring))}) | map( {(.name): .ip} )|add' > vagrant/solr-servers.json
Expand All @@ -132,7 +127,7 @@ vagrant-provisioner() {

export SOLR_STARTUP_PARAMS=`jq -r '."cluster"."startup-params"' $CONFIGFILE`
export ZK_NODE=`jq -r ".[]" vagrant/zk-servers.json`
export ZK_TARBALL_PATH="$ORIG_WORKING_DIR/apache-zookeeper-3.6.1-bin.tar.gz"
export ZK_TARBALL_PATH="$ORIG_WORKING_DIR/apache-zookeeper-3.6.3-bin.tar.gz"
export BENCH_USER="vagrant"
export BENCH_KEY="vagrant/id_rsa"

Expand Down Expand Up @@ -243,12 +238,3 @@ then
vagrant destroy -f
rm id_rsa*
fi
<<<<<<< HEAD
if [ "vagrant" == `jq -r '.["cluster"]["provisioning-method"]' $CONFIGFILE` ];
then
cd $ORIG_WORKING_DIR/vagrant
vagrant destroy -f
rm id_rsa*
fi
=======
>>>>>>> stress-harness