Rename and move Azure scripts.

cluster/azure/kube-down.sh

@@ -16,8 +16,8 @@
 
 # Tear down a Kubernetes cluster.
 SCRIPT_DIR=$(CDPATH="" cd $(dirname $0); pwd)
-source $SCRIPT_DIR/../release/config-azure.sh
-source $SCRIPT_DIR/util.sh
+source $SCRIPT_DIR/../../release/azure/config.sh
+source $SCRIPT_DIR/../util.sh
 
 echo "Bringing down cluster"
 azure vm delete $MASTER_NAME -b -q

cluster/azure/kube-up.sh

@@ -21,15 +21,15 @@ set -eu
 set -o pipefail
 SCRIPT_DIR=$(CDPATH="" cd $(dirname $0); pwd)
 
-source $SCRIPT_DIR/../release/config-azure.sh
-source $SCRIPT_DIR/util.sh
+source $SCRIPT_DIR/../../release/azure/config.sh
+source $SCRIPT_DIR/../util.sh
 
 KUBE_TEMP=$(mktemp -d -t kubernetes.XXXXXX)
 trap "rm -rf ${KUBE_TEMP}" EXIT
 
 get-password
 echo "Using password: $user:$passwd"
-python $SCRIPT_DIR/../third_party/htpasswd/htpasswd.py -b -c \
+python $SCRIPT_DIR/../../third_party/htpasswd/htpasswd.py -b -c \
     ${KUBE_TEMP}/htpasswd $user $passwd
 HTPASSWD=$(cat ${KUBE_TEMP}/htpasswd)
 
@@ -39,8 +39,8 @@ HTPASSWD=$(cat ${KUBE_TEMP}/htpasswd)
   echo "MASTER_NAME=${MASTER_NAME}"
   echo "MASTER_RELEASE_TAR=${FULL_URL}"
   echo "MASTER_HTPASSWD='${HTPASSWD}'"
-  grep -v "^#" $SCRIPT_DIR/templates/download-release-azure.sh
-  grep -v "^#" $SCRIPT_DIR/templates/salt-master-azure.sh
+  grep -v "^#" $SCRIPT_DIR/templates/download-release.sh
+  grep -v "^#" $SCRIPT_DIR/templates/salt-master.sh
 ) > ${KUBE_TEMP}/master-start.sh
 
 echo "Starting VMs"
@@ -81,7 +81,7 @@ for (( i=0; i<${#MINION_NAMES[@]}; i++)); do
         echo "#!/bin/bash"
         echo "MASTER_NAME=${MASTER_NAME}"
         echo "MINION_IP_RANGE=${MINION_IP_RANGES[$i]}"
-        grep -v "^#" $SCRIPT_DIR/templates/salt-minion-azure.sh
+        grep -v "^#" $SCRIPT_DIR/templates/salt-minion.sh
     ) > ${KUBE_TEMP}/minion-start-${i}.sh
 
     azure vm create \

hack/azure/dev-build-and-up.sh

@@ -17,8 +17,10 @@
 # This script will build a dev release and bring up a new cluster with that
 # release.
 
+SCRIPT_DIR=$(CDPATH="" cd $(dirname $0); pwd)
+
 # First build a release
-$(dirname $0)/../release/release-azure.sh
+$SCRIPT_DIR/../../release/azure/release.sh
 
 # Now bring a new cluster up with that release.
-$(dirname $0)/../cluster/kube-up-azure.sh
+$SCRIPT_DIR/../../cluster/azure/kube-up.sh

release/azure/release.sh

@@ -25,10 +25,10 @@ function json_val () {
     python -c 'import json,sys;obj=json.load(sys.stdin);print obj'$1'';
 }
 
-source $SCRIPT_DIR/config-azure.sh
-source $SCRIPT_DIR/../cluster/${KUBE_CONFIG_FILE-"config-default.sh"}
+source $SCRIPT_DIR/config.sh
+source $SCRIPT_DIR/../../cluster/${KUBE_CONFIG_FILE-"config-default.sh"}
 
-$SCRIPT_DIR/build-release.sh $INSTANCE_PREFIX
+$SCRIPT_DIR/../build-release.sh $INSTANCE_PREFIX
 
 if [ -z "$(azure storage account show $STG_ACCOUNT 2>/dev/null | \
     grep data)" ]; then
@@ -59,6 +59,6 @@ fi
 azure storage blob upload \
     -a $STG_ACCOUNT \
     -k "$stg_key" \
-    $SCRIPT_DIR/../output/release/master-release.tgz \
+    $SCRIPT_DIR/../../output/release/master-release.tgz \
     $CONTAINER \
     master-release.tgz