Merge pull request juju#12175 from hmlanigan/aws-regions

juju#12175 Add new regions for AWS: af-south-1 and eu-south-1. ## QA steps Bootstrapping either of these 2 regions requires enabling it in your aws account. ```console $ juju region aws Client Cloud Regions ... eu-north-1 eu-south-1 af-south-1 ap-east-1 ... # # enabling the eu-south-1 region is taking a while, however the api endpoint works and we can attempt to start # an instance, seeing that there are 3 AZ for the region. # $ juju bootstrap aws/eu-south-1 Creating Juju controller "aws-eu-south-1" on aws/eu-south-1 Looking for packaged Juju agent version 2.8.6 for amd64 No packaged binary found, preparing local Juju agent binary Launching controller instance(s) on aws/eu-south-1... Cloud credential "credentials" is not accepted by cloud provider: Your account is pending verification by Amazon.: Your request for accessing resources in this region is being validated, and you will not be able to launch additional resources in this region until the validation is complete. We will notify you by email once your request has been validated. While normally resolved within minutes, please allow up to 4 hours for this process to complete. If the issue still persists, please let us know by writing to [email protected] for further assistance. (PendingVerification) Cloud credential "credentials" is not accepted by cloud provider: Your account is pending verification by Amazon.: Your request for accessing resources in this region is being validated, and you will not be able to launch additional resources in this region until the validation is complete. We will notify you by email once your request has been validated. While normally resolved within minutes, please allow up to 4 hours for this process to complete. If the issue still persists, please let us know by writing to [email protected] for further assistance. (PendingVerification) Cloud credential "credentials" is not accepted by cloud provider: Your account is pending verification by Amazon.: Your request for accessing resources in this region is being validated, and you will not be able to launch additional resources in this region until the validation is complete. We will notify you by email once your request has been validated. While normally resolved within minutes, please allow up to 4 hours for this process to complete. If the issue still persists, please let us know by writing to [email protected] for further assistance. (PendingVerification) ERROR failed to bootstrap model: cannot start bootstrap instance in any availability zone (eu-south-1a, eu-south-1b, eu-south-1c) # # google changes # $ juju regions google Client Cloud Regions ... us-west2 us-west3 us-west4 asia-east1 ... asia-southeast1 asia-southeast2 australia-southeast1 ... $ juju bootstrap google/us-west3 Creating Juju controller "google-us-west3" on google/us-west3 ... Bootstrap complete, controller "google-us-west3" is now available Controller machines are in the "controller" model Initial model "default" added ```
sdg0919 · Oct 22, 2020 · fbb6344 · fbb6344
2 parents 66bf72a + a9f26c1
commit fbb6344
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 1 deletion.
diff --git a/cloud/fallback-public-cloud.yaml b/cloud/fallback-public-cloud.yaml
@@ -25,6 +25,10 @@ clouds:
         endpoint: https://ec2.eu-central-1.amazonaws.com
       eu-north-1:
         endpoint: https://ec2.eu-north-1.amazonaws.com
+      eu-south-1:
+        endpoint: https://ec2.eu-south-1.amazonaws.com
+      af-south-1:
+        endpoint: https://ec2.af-south-1.amazonaws.com
       ap-east-1:
         endpoint: https://ec2.ap-east-1.amazonaws.com
       ap-south-1:
@@ -76,6 +80,10 @@ clouds:
         endpoint: https://www.googleapis.com
       us-west2:
         endpoint: https://www.googleapis.com
+      us-west3:
+        endpoint: https://www.googleapis.com
+      us-west4:
+        endpoint: https://www.googleapis.com
       asia-east1:
         endpoint: https://www.googleapis.com
       asia-east2:
@@ -90,6 +98,8 @@ clouds:
         endpoint: https://www.googleapis.com
       asia-southeast1:
         endpoint: https://www.googleapis.com
+      asia-southeast2:
+        endpoint: https://www.googleapis.com
       australia-southeast1:
         endpoint: https://www.googleapis.com
       europe-north1:

diff --git a/cloud/fallback_public_cloud.go b/cloud/fallback_public_cloud.go
@@ -32,6 +32,10 @@ clouds:
         endpoint: https://ec2.eu-central-1.amazonaws.com
       eu-north-1:
         endpoint: https://ec2.eu-north-1.amazonaws.com
+      eu-south-1:
+        endpoint: https://ec2.eu-south-1.amazonaws.com
+      af-south-1:
+        endpoint: https://ec2.af-south-1.amazonaws.com
       ap-east-1:
         endpoint: https://ec2.ap-east-1.amazonaws.com
       ap-south-1:
@@ -83,6 +87,10 @@ clouds:
         endpoint: https://www.googleapis.com
       us-west2:
         endpoint: https://www.googleapis.com
+      us-west3:
+        endpoint: https://www.googleapis.com
+      us-west4:
+        endpoint: https://www.googleapis.com
       asia-east1:
         endpoint: https://www.googleapis.com
       asia-east2:
@@ -97,6 +105,8 @@ clouds:
         endpoint: https://www.googleapis.com
       asia-southeast1:
         endpoint: https://www.googleapis.com
+      asia-southeast2:
+        endpoint: https://www.googleapis.com
       australia-southeast1:
         endpoint: https://www.googleapis.com
       europe-north1:

diff --git a/cmd/juju/commands/bootstrap_test.go b/cmd/juju/commands/bootstrap_test.go
@@ -2032,6 +2032,8 @@ eu-west-2
 eu-west-3
 eu-central-1
 eu-north-1
+eu-south-1
+af-south-1
 ap-east-1
 ap-south-1
 ap-southeast-1
@@ -2048,7 +2050,7 @@ func (s *BootstrapSuite) TestBootstrapInvalidRegion(c *gc.C) {
 	resetJujuXDGDataHome(c)
 	ctx, err := cmdtesting.RunCommand(c, s.newBootstrapCommand(), "aws/eu-west")
 	c.Assert(err, gc.ErrorMatches, `region "eu-west" for cloud "aws" not valid`)
-	c.Assert(cmdtesting.Stderr(ctx), gc.Equals, "Available cloud regions are ap-east-1, ap-northeast-1, ap-northeast-2, ap-northeast-3, ap-south-1, ap-southeast-1, ap-southeast-2, ca-central-1, eu-central-1, eu-north-1, eu-west-1, eu-west-2, eu-west-3, me-south-1, sa-east-1, us-east-1, us-east-2, us-west-1, us-west-2\n")
+	c.Assert(cmdtesting.Stderr(ctx), gc.Equals, "Available cloud regions are af-south-1, ap-east-1, ap-northeast-1, ap-northeast-2, ap-northeast-3, ap-south-1, ap-southeast-1, ap-southeast-2, ca-central-1, eu-central-1, eu-north-1, eu-south-1, eu-west-1, eu-west-2, eu-west-3, me-south-1, sa-east-1, us-east-1, us-east-2, us-west-1, us-west-2\n")
 	c.Assert(cmdtesting.Stdout(ctx), gc.Equals, ``)
 }