Merge pull request #190 from hpidcock/fix-cloud-name

Fix localhost cloudname for local lxd cloud.
juju · May 31, 2024 · ff336a9 · ff336a9
2 parents 11b9fa1 + 91bcce3
commit ff336a9
Show file tree

Hide file tree

Showing 31 changed files with 82 additions and 81 deletions.
diff --git a/jobs/ci-run/integration/gen/test-actions.yml b/jobs/ci-run/integration/gen/test-actions.yml
@@ -314,7 +314,7 @@
         - s390x
         - ppc64el
     - string:
-        default: 'lxd'
+        default: 'localhost'
         description: 'Cloud to use when bootstrapping Juju'
         name: BOOTSTRAP_CLOUD
     - string:

diff --git a/jobs/ci-run/integration/gen/test-agents.yml b/jobs/ci-run/integration/gen/test-agents.yml
@@ -148,7 +148,7 @@
         - s390x
         - ppc64el
     - string:
-        default: 'lxd'
+        default: 'localhost'
         description: 'Cloud to use when bootstrapping Juju'
         name: BOOTSTRAP_CLOUD
     - string:

diff --git a/jobs/ci-run/integration/gen/test-appdata.yml b/jobs/ci-run/integration/gen/test-appdata.yml
@@ -148,7 +148,7 @@
         - s390x
         - ppc64el
     - string:
-        default: 'lxd'
+        default: 'localhost'
         description: 'Cloud to use when bootstrapping Juju'
         name: BOOTSTRAP_CLOUD
     - string:

diff --git a/jobs/ci-run/integration/gen/test-backup.yml b/jobs/ci-run/integration/gen/test-backup.yml
@@ -148,7 +148,7 @@
         - s390x
         - ppc64el
     - string:
-        default: 'lxd'
+        default: 'localhost'
         description: 'Cloud to use when bootstrapping Juju'
         name: BOOTSTRAP_CLOUD
     - string:

diff --git a/jobs/ci-run/integration/gen/test-bootstrap.yml b/jobs/ci-run/integration/gen/test-bootstrap.yml
@@ -74,7 +74,7 @@
         - s390x
         - ppc64el
     - string:
-        default: 'lxd'
+        default: 'localhost'
         description: 'Cloud to use when bootstrapping Juju'
         name: BOOTSTRAP_CLOUD
     - string:

diff --git a/jobs/ci-run/integration/gen/test-branches.yml b/jobs/ci-run/integration/gen/test-branches.yml
@@ -152,7 +152,7 @@
         - s390x
         - ppc64el
     - string:
-        default: 'lxd'
+        default: 'localhost'
         description: 'Cloud to use when bootstrapping Juju'
         name: BOOTSTRAP_CLOUD
     - string:
@@ -292,7 +292,7 @@
         - s390x
         - ppc64el
     - string:
-        default: 'lxd'
+        default: 'localhost'
         description: 'Cloud to use when bootstrapping Juju'
         name: BOOTSTRAP_CLOUD
     - string:

diff --git a/jobs/ci-run/integration/gen/test-charmhub.yml b/jobs/ci-run/integration/gen/test-charmhub.yml
@@ -156,7 +156,7 @@
         - s390x
         - ppc64el
     - string:
-        default: 'lxd'
+        default: 'localhost'
         description: 'Cloud to use when bootstrapping Juju'
         name: BOOTSTRAP_CLOUD
     - string:
@@ -296,7 +296,7 @@
         - s390x
         - ppc64el
     - string:
-        default: 'lxd'
+        default: 'localhost'
         description: 'Cloud to use when bootstrapping Juju'
         name: BOOTSTRAP_CLOUD
     - string:
@@ -436,7 +436,7 @@
         - s390x
         - ppc64el
     - string:
-        default: 'lxd'
+        default: 'localhost'
         description: 'Cloud to use when bootstrapping Juju'
         name: BOOTSTRAP_CLOUD
     - string:

diff --git a/jobs/ci-run/integration/gen/test-cli.yml b/jobs/ci-run/integration/gen/test-cli.yml
@@ -86,7 +86,7 @@
         - s390x
         - ppc64el
     - string:
-        default: 'lxd'
+        default: 'localhost'
         description: 'Cloud to use when bootstrapping Juju'
         name: BOOTSTRAP_CLOUD
     - string:
@@ -154,7 +154,7 @@
         - s390x
         - ppc64el
     - string:
-        default: 'lxd'
+        default: 'localhost'
         description: 'Cloud to use when bootstrapping Juju'
         name: BOOTSTRAP_CLOUD
     - string:
@@ -222,7 +222,7 @@
         - s390x
         - ppc64el
     - string:
-        default: 'lxd'
+        default: 'localhost'
         description: 'Cloud to use when bootstrapping Juju'
         name: BOOTSTRAP_CLOUD
     - string:
@@ -290,7 +290,7 @@
         - s390x
         - ppc64el
     - string:
-        default: 'lxd'
+        default: 'localhost'
         description: 'Cloud to use when bootstrapping Juju'
         name: BOOTSTRAP_CLOUD
     - string:
@@ -358,7 +358,7 @@
         - s390x
         - ppc64el
     - string:
-        default: 'lxd'
+        default: 'localhost'
         description: 'Cloud to use when bootstrapping Juju'
         name: BOOTSTRAP_CLOUD
     - string:
@@ -426,7 +426,7 @@
         - s390x
         - ppc64el
     - string:
-        default: 'lxd'
+        default: 'localhost'
         description: 'Cloud to use when bootstrapping Juju'
         name: BOOTSTRAP_CLOUD
     - string:
@@ -494,7 +494,7 @@
         - s390x
         - ppc64el
     - string:
-        default: 'lxd'
+        default: 'localhost'
         description: 'Cloud to use when bootstrapping Juju'
         name: BOOTSTRAP_CLOUD
     - string:

diff --git a/jobs/ci-run/integration/gen/test-cmr.yml b/jobs/ci-run/integration/gen/test-cmr.yml
@@ -148,7 +148,7 @@
         - s390x
         - ppc64el
     - string:
-        default: 'lxd'
+        default: 'localhost'
         description: 'Cloud to use when bootstrapping Juju'
         name: BOOTSTRAP_CLOUD
     - string:

diff --git a/jobs/ci-run/integration/gen/test-constraints.yml b/jobs/ci-run/integration/gen/test-constraints.yml
@@ -148,7 +148,7 @@
         - s390x
         - ppc64el
     - string:
-        default: 'lxd'
+        default: 'localhost'
         description: 'Cloud to use when bootstrapping Juju'
         name: BOOTSTRAP_CLOUD
     - string:

diff --git a/jobs/ci-run/integration/gen/test-controller.yml b/jobs/ci-run/integration/gen/test-controller.yml
@@ -160,7 +160,7 @@
         - s390x
         - ppc64el
     - string:
-        default: 'lxd'
+        default: 'localhost'
         description: 'Cloud to use when bootstrapping Juju'
         name: BOOTSTRAP_CLOUD
     - string:
@@ -300,7 +300,7 @@
         - s390x
         - ppc64el
     - string:
-        default: 'lxd'
+        default: 'localhost'
         description: 'Cloud to use when bootstrapping Juju'
         name: BOOTSTRAP_CLOUD
     - string:
@@ -440,7 +440,7 @@
         - s390x
         - ppc64el
     - string:
-        default: 'lxd'
+        default: 'localhost'
         description: 'Cloud to use when bootstrapping Juju'
         name: BOOTSTRAP_CLOUD
     - string:
@@ -586,7 +586,7 @@
         - s390x
         - ppc64el
     - string:
-        default: 'lxd'
+        default: 'localhost'
         description: 'Cloud to use when bootstrapping Juju'
         name: BOOTSTRAP_CLOUD
     - string:

diff --git a/jobs/ci-run/integration/gen/test-controllercharm.yml b/jobs/ci-run/integration/gen/test-controllercharm.yml
@@ -76,7 +76,7 @@
         - s390x
         - ppc64el
     - string:
-        default: 'lxd'
+        default: 'localhost'
         description: 'Cloud to use when bootstrapping Juju'
         name: BOOTSTRAP_CLOUD
     - string:

diff --git a/jobs/ci-run/integration/gen/test-credential.yml b/jobs/ci-run/integration/gen/test-credential.yml
@@ -152,7 +152,7 @@
         - s390x
         - ppc64el
     - string:
-        default: 'lxd'
+        default: 'localhost'
         description: 'Cloud to use when bootstrapping Juju'
         name: BOOTSTRAP_CLOUD
     - string:
@@ -292,7 +292,7 @@
         - s390x
         - ppc64el
     - string:
-        default: 'lxd'
+        default: 'localhost'
         description: 'Cloud to use when bootstrapping Juju'
         name: BOOTSTRAP_CLOUD
     - string:

diff --git a/jobs/ci-run/integration/gen/test-dashboard.yml b/jobs/ci-run/integration/gen/test-dashboard.yml
@@ -154,7 +154,7 @@
         - s390x
         - ppc64el
     - string:
-        default: 'lxd'
+        default: 'localhost'
         description: 'Cloud to use when bootstrapping Juju'
         name: BOOTSTRAP_CLOUD
     - string:

diff --git a/jobs/ci-run/integration/gen/test-deploy.yml b/jobs/ci-run/integration/gen/test-deploy.yml
@@ -164,7 +164,7 @@
         - s390x
         - ppc64el
     - string:
-        default: 'lxd'
+        default: 'localhost'
         description: 'Cloud to use when bootstrapping Juju'
         name: BOOTSTRAP_CLOUD
     - string:
@@ -304,7 +304,7 @@
         - s390x
         - ppc64el
     - string:
-        default: 'lxd'
+        default: 'localhost'
         description: 'Cloud to use when bootstrapping Juju'
         name: BOOTSTRAP_CLOUD
     - string:
@@ -444,7 +444,7 @@
         - s390x
         - ppc64el
     - string:
-        default: 'lxd'
+        default: 'localhost'
         description: 'Cloud to use when bootstrapping Juju'
         name: BOOTSTRAP_CLOUD
     - string:
@@ -584,7 +584,7 @@
         - s390x
         - ppc64el
     - string:
-        default: 'lxd'
+        default: 'localhost'
         description: 'Cloud to use when bootstrapping Juju'
         name: BOOTSTRAP_CLOUD
     - string:
@@ -724,7 +724,7 @@
         - s390x
         - ppc64el
     - string:
-        default: 'lxd'
+        default: 'localhost'
         description: 'Cloud to use when bootstrapping Juju'
         name: BOOTSTRAP_CLOUD
     - string:
@@ -864,7 +864,7 @@
         - s390x
         - ppc64el
     - string:
-        default: 'lxd'
+        default: 'localhost'
         description: 'Cloud to use when bootstrapping Juju'
         name: BOOTSTRAP_CLOUD
     - string:

diff --git a/jobs/ci-run/integration/gen/test-hooks.yml b/jobs/ci-run/integration/gen/test-hooks.yml
@@ -152,7 +152,7 @@
         - s390x
         - ppc64el
     - string:
-        default: 'lxd'
+        default: 'localhost'
         description: 'Cloud to use when bootstrapping Juju'
         name: BOOTSTRAP_CLOUD
     - string:
@@ -292,7 +292,7 @@
         - s390x
         - ppc64el
     - string:
-        default: 'lxd'
+        default: 'localhost'
         description: 'Cloud to use when bootstrapping Juju'
         name: BOOTSTRAP_CLOUD
     - string:

diff --git a/jobs/ci-run/integration/gen/test-hooktools.yml b/jobs/ci-run/integration/gen/test-hooktools.yml
@@ -148,7 +148,7 @@
         - s390x
         - ppc64el
     - string:
-        default: 'lxd'
+        default: 'localhost'
         description: 'Cloud to use when bootstrapping Juju'
         name: BOOTSTRAP_CLOUD
     - string:

diff --git a/jobs/ci-run/integration/gen/test-machine.yml b/jobs/ci-run/integration/gen/test-machine.yml
@@ -148,7 +148,7 @@
         - s390x
         - ppc64el
     - string:
-        default: 'lxd'
+        default: 'localhost'
         description: 'Cloud to use when bootstrapping Juju'
         name: BOOTSTRAP_CLOUD
     - string:

diff --git a/jobs/ci-run/integration/gen/test-manual.yml b/jobs/ci-run/integration/gen/test-manual.yml
@@ -152,7 +152,7 @@
         - s390x
         - ppc64el
     - string:
-        default: 'lxd'
+        default: 'localhost'
         description: 'Cloud to use when bootstrapping Juju'
         name: BOOTSTRAP_CLOUD
     - string:
@@ -292,7 +292,7 @@
         - s390x
         - ppc64el
     - string:
-        default: 'lxd'
+        default: 'localhost'
         description: 'Cloud to use when bootstrapping Juju'
         name: BOOTSTRAP_CLOUD
     - string: