Install script tweaks

Author: deliahu

cortex.sh

@@ -114,12 +114,12 @@ function set_aws_credentials_from_cli() {
   export AWS_ACCESS_KEY_ID=$(aws --profile default configure get aws_access_key_id)
   export AWS_SECRET_ACCESS_KEY=$(aws --profile default configure get aws_secret_access_key)
 
-  echo -e "\n✓ Installation will use AWS_ACCESS_KEY_ID=$AWS_ACCESS_KEY_ID (from AWS CLI's default profile)"
+  echo -e "\n✓ Using AWS_ACCESS_KEY_ID=$AWS_ACCESS_KEY_ID (from AWS CLI's default profile)"
 }
 
 function set_aws_credentials() {
   if [ "$AWS_ACCESS_KEY_ID" != "" ] && [ "$AWS_SECRET_ACCESS_KEY" != "" ]; then
-    echo -e "\n✓ Installation will use AWS_ACCESS_KEY_ID=$AWS_ACCESS_KEY_ID (from environment variable)"
+    echo -e "\n✓ Using AWS_ACCESS_KEY_ID=$AWS_ACCESS_KEY_ID (from environment variable)"
     return
   fi
 
@@ -486,11 +486,11 @@ if [ "$arg1" = "install" ]; then
     show_help
     exit 1
   elif [ "$arg2" = "" ]; then
-    prompt_for_telemetry && install_eks && install_cortex && info
+    prompt_for_telemetry && install_eks && install_cortex
   elif [ "$arg2" = "cli" ]; then
     prompt_for_email && install_cli
   elif [ "$arg2" = "cortex" ]; then # Undocumented (just for dev)
-    install_cortex && info
+    install_cortex
   elif [ "$arg2" = "" ]; then
     echo -e "\nerror: missing subcommand for install"
     show_help

manager/install_cortex.sh

@@ -152,8 +152,6 @@ function validate_cortex() {
         continue
       fi
       operator_endpoint_reachable="ready"
-      echo "{\"cortex_url\": \"$operator_endpoint\", \"aws_access_key_id\": \"$CORTEX_AWS_ACCESS_KEY_ID\", \"aws_secret_access_key\": \"$CORTEX_AWS_SECRET_ACCESS_KEY\"}" > /.cortex/default.json
-      echo -e "\n✓ Configured CLI"
     fi
 
     if [ "$operator_pod_ready_cycles" == "0" ] && [ "$operator_pod_name" != "" ]; then
@@ -214,4 +212,7 @@ echo "✓ Started operator"
 
 validate_cortex
 
+echo "{\"cortex_url\": \"$operator_endpoint\", \"aws_access_key_id\": \"$CORTEX_AWS_ACCESS_KEY_ID\", \"aws_secret_access_key\": \"$CORTEX_AWS_SECRET_ACCESS_KEY\"}" > /.cortex/default.json
+echo -e "✓ Configured CLI"
+
 echo -e "\n✓ Cortex is ready!"