Merge release branch into master branch [skip ci]

nubisproject · Jul 13, 2018 · 634ca84 · 634ca84
2 parents 5648e9c + 30171c0
commit 634ca84
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,15 +1,25 @@
 # Change Log
 
+## [v0.17.0](https://github.com/nubisproject/nubis-docker-deploy/tree/v0.17.0) (2018-07-13)
+[Full Changelog](https://github.com/nubisproject/nubis-docker-deploy/compare/v0.16.0...v0.17.0)
+
+**Merged pull requests:**
+
+- Work around AWS S333diocy [\#88](https://github.com/nubisproject/nubis-docker-deploy/pull/88) ([tinnightcap](https://github.com/tinnightcap))
+
 ## [v0.16.0](https://github.com/nubisproject/nubis-docker-deploy/tree/v0.16.0) (2018-07-11)
 [Full Changelog](https://github.com/nubisproject/nubis-docker-deploy/compare/v0.15.0...v0.16.0)
 
 **Closed issues:**
 
 - Add debugging output for terraform [\#83](https://github.com/nubisproject/nubis-docker-deploy/issues/83)
 - Expose $rv to caller [\#82](https://github.com/nubisproject/nubis-docker-deploy/issues/82)
+- Tag v0.16.0 release [\#85](https://github.com/nubisproject/nubis-docker-deploy/issues/85)
 
 **Merged pull requests:**
 
+- Update CHANGELOG for v0.16.0 release \[skip ci\] [\#87](https://github.com/nubisproject/nubis-docker-deploy/pull/87) ([nubis-automation](https://github.com/nubis-automation))
+- Update CHANGELOG for v0.16.0 release \[skip ci\] [\#86](https://github.com/nubisproject/nubis-docker-deploy/pull/86) ([nubis-automation](https://github.com/nubis-automation))
 - Carry $rv through and add Terraform debug support [\#84](https://github.com/nubisproject/nubis-docker-deploy/pull/84) ([tinnightcap](https://github.com/tinnightcap))
 
 ## [v0.15.0](https://github.com/nubisproject/nubis-docker-deploy/tree/v0.15.0) (2018-07-03)

diff --git a/nubis-deploy b/nubis-deploy
@@ -105,7 +105,7 @@ setup-terraform () {
     else
         export STATE_BUCKET
     fi
-    BUCKET_REGION=$(aws s3api get-bucket-location --bucket "${STATE_BUCKET}" | jq -r '.LocationConstraint')
+    BUCKET_REGION=$(aws s3api get-bucket-location --bucket "${STATE_BUCKET}" | jq -r '.LocationConstraint // "us-east-1"')
     # Make sure we got a state bucket region
     if [ "${BUCKET_REGION}" == 'null' ]; then
         echo -e "\033[1;31mERROR: Could not look up bucket location using:\033[0m"