diff --git a/images/createImage b/images/createImage index 4014a4046..c8c2b1c6a 100755 --- a/images/createImage +++ b/images/createImage @@ -12,7 +12,6 @@ export JSON="${INSTALLER_DIR}/node_modules/.bin/json" provider="digitalocean" installer_revision=$(git rev-parse HEAD) -image_regions=(sfo1 ams3) box_name="" server_id="" server_ip="" @@ -31,7 +30,6 @@ while true; do case "$1" in --env) deploy_env="$2"; shift 2;; --revision) installer_revision="$2"; shift 2;; - --regions) image_regions=("$2"); shift 2;; # parse as whitespace separated array --provider) provider="$2"; shift 2;; --box) box_name="$2"; destroy_server="no"; shift 2;; --no-destroy) destroy_server="no"; shift 2;; @@ -98,8 +96,8 @@ if [[ -z "${box_name}" ]]; then fi echo "Detected caas ssh key id: ${caas_ssh_key_id}" - echo "Creating Server with name [${box_name}] at [${image_regions[0]}]" - server_id=$($vps create ${caas_ssh_key_id} ${box_name} ${image_regions[0]}) + echo "Creating Server with name [${box_name}]" + server_id=$($vps create ${caas_ssh_key_id} ${box_name}) if [[ -z "${server_id}" ]]; then echo "Failed to create server" exit 1 @@ -186,6 +184,7 @@ fi echo "Transferring image to other regions" xfer_events=() +image_regions=(sfo1 ams3) # remove this # skip the first region, as the image was created there for image_region in ${image_regions[@]:1}; do xfer_event=$($vps transfer_image ${image_id} ${image_region}) diff --git a/images/digitalocean.sh b/images/digitalocean.sh index 812235d2a..27a19b3b1 100755 --- a/images/digitalocean.sh +++ b/images/digitalocean.sh @@ -26,8 +26,8 @@ function get_ssh_key_id() { function create_droplet() { local ssh_key_id="$1" local box_name="$2" - local image_region="$3" + local image_region="sfo1" local ubuntu_image_slug="ubuntu-15-04-x64" # id=12658446 local box_size="512mb"