Remove joyent from cloud metadata

sdg0919 · Sep 28, 2020 · 7c69190 · 7c69190
1 parent 0f46b23
commit 7c69190
Show file tree

Hide file tree

Showing 5 changed files with 1 addition and 37 deletions.
diff --git a/cloud/clouds.go b/cloud/clouds.go
@@ -404,7 +404,6 @@ var defaultCloudDescription = map[string]string{
 	"azure":       "Microsoft Azure",
 	"azure-china": "Microsoft Azure China",
 	"rackspace":   "Rackspace Cloud",
-	"joyent":      "Joyent Cloud",
 	"cloudsigma":  "CloudSigma Cloud",
 	"lxd":         "LXD Container Hypervisor",
 	"maas":        "Metal As A Service",

diff --git a/cloud/clouds_test.go b/cloud/clouds_test.go
@@ -23,7 +23,7 @@ type cloudSuite struct {
 var _ = gc.Suite(&cloudSuite{})
 
 var publicCloudNames = []string{
-	"aws", "aws-china", "aws-gov", "google", "azure", "azure-china", "rackspace", "joyent", "cloudsigma", "oracle",
+	"aws", "aws-china", "aws-gov", "google", "azure", "azure-china", "rackspace", "cloudsigma", "oracle",
 }
 
 func parsePublicClouds(c *gc.C) map[string]cloud.Cloud {

diff --git a/cloud/fallback-public-cloud.yaml b/cloud/fallback-public-cloud.yaml
@@ -312,23 +312,6 @@ clouds:
         endpoint: https://identity.api.rackspacecloud.com/v2.0
       hkg:
         endpoint: https://identity.api.rackspacecloud.com/v2.0
-  joyent:
-    type: joyent
-    description: Joyent Cloud
-    auth-types: [ userpass ]
-    regions:
-      us-east-1:
-        endpoint: https://us-east-1.api.joyentcloud.com
-      us-east-2:
-        endpoint: https://us-east-2.api.joyentcloud.com
-      us-east-3:
-        endpoint: https://us-east-3.api.joyentcloud.com
-      us-west-1:
-        endpoint: https://us-west-1.api.joyentcloud.com
-      us-sw-1:
-        endpoint: https://us-sw-1.api.joyentcloud.com
-      eu-ams-1:
-        endpoint: https://eu-ams-1.api.joyentcloud.com
   cloudsigma:
     type: cloudsigma
     description: CloudSigma Cloud

diff --git a/cloud/fallback_public_cloud.go b/cloud/fallback_public_cloud.go
@@ -319,23 +319,6 @@ clouds:
         endpoint: https://identity.api.rackspacecloud.com/v2.0
       hkg:
         endpoint: https://identity.api.rackspacecloud.com/v2.0
-  joyent:
-    type: joyent
-    description: Joyent Cloud
-    auth-types: [ userpass ]
-    regions:
-      us-east-1:
-        endpoint: https://us-east-1.api.joyentcloud.com
-      us-east-2:
-        endpoint: https://us-east-2.api.joyentcloud.com
-      us-east-3:
-        endpoint: https://us-east-3.api.joyentcloud.com
-      us-west-1:
-        endpoint: https://us-west-1.api.joyentcloud.com
-      us-sw-1:
-        endpoint: https://us-sw-1.api.joyentcloud.com
-      eu-ams-1:
-        endpoint: https://eu-ams-1.api.joyentcloud.com
   cloudsigma:
     type: cloudsigma
     description: CloudSigma Cloud

diff --git a/cmd/juju/cloud/add.go b/cmd/juju/cloud/add.go
@@ -102,7 +102,6 @@ clouds:                           # mandatory
  - cloudsigma
  - ec2
  - gce
- - joyent
  - oci
 
 When a running controller is updated, the credential for the cloud
-Original file line number
+Diff line change
@@ Expand Up / @@ -102,7 +102,6 @@ clouds: # mandatory @@
      - cloudsigma
      - ec2
      - gce
-     - joyent
      - oci
     When a running controller is updated, the credential for the cloud
@@ Expand Down @@