Merge pull request #5676 from hashicorp/fix5669

Correctly set aws region if given in template along with a profile.
8 years ago · da4d6f76be
parent ca26ab5d5a 7b5c0900ef
commit da4d6f76be
1 changed files with 3 additions and 1 deletions
--- a/builder/amazon/common/access_config.go
+++ b/builder/amazon/common/access_config.go
@ -40,7 +40,9 @@ func (c *AccessConfig) Session() (*session.Session, error) {
 		if err := os.Setenv("AWS_PROFILE", c.ProfileName); err != nil {
 			return nil, fmt.Errorf("Set env error: %s", err)
 		}
-	} else if c.RawRegion != "" {
+	}
+
+	if c.RawRegion != "" {
 		config = config.WithRegion(c.RawRegion)
 	} else if region := c.metadataRegion(); region != "" {
 		config = config.WithRegion(region)