Merge ~mthaddon/mojo/+git/subordinates:master into ~mojo-maintainers/mojo/+git/subordinates:master

[Tom Haddon]

Switch to charmhub locations, and use the correct ubuntu-advantage version

Switch to charmhub locations, and use the correct ubuntu-advantage version

[🤖 Canonical IS Merge Bot (canonical-is-mergebot)]

This merge proposal is being monitored by mergebot. Change the status to Approved to merge.

[Junien F (axino)]

+1

review: Approve

[🤖 Canonical IS Merge Bot (canonical-is-mergebot)]

Change successfully merged at revision 6072275a6c62c52186e20b95e47a97e686200691

diff --git a/bundle-userdir-ldap.yaml b/bundle-userdir-ldap.yaml
index cd8e1e9..4a0facb 100644
--- a/bundle-userdir-ldap.yaml
+++ b/bundle-userdir-ldap.yaml
@@ -2,6 +2,6 @@ series: {{ series }}
 applications:
   userdir-ldap:
     series: {{ series }}
-    charm: cs:userdir-ldap
+    charm: ch:userdir-ldap
     options:
       apt-repo-spec: "ppa:canonical-sysadmins/ubuntu/ud-ldap"
diff --git a/bundle.yaml b/bundle.yaml
index ba73d2a..e3a6c57 100644
--- a/bundle.yaml
+++ b/bundle.yaml
@@ -2,7 +2,7 @@ series: {{ series }}
 applications:
   landscape-client:
     series: {{ series }}
-    charm: cs:landscape-client
+    charm: ch:landscape-client
     options:
       registration-key: include-file://{{local_dir}}/canonical-is-landscape.key
       url: https://landscape.is.canonical.com/message-system
@@ -10,10 +10,11 @@ applications:
       account-name: standalone
   telegraf:
     series: {{ series }}
-    charm: cs:~llama-charmers-next/telegraf
+    charm: ch:telegraf
+    channel: candidate
   ubuntu-advantage:
     series: {{ series }}
-    charm: cs:~ubuntu-advantage-charmers/ubuntu-advantage
+    charm: ch:ubuntu-advantage
     options:
       ppa: ppa:ua-client/stable
       token: include-file://{{local_dir}}/canonical-is-ua.key