Merge lp:~mthaddon/mojo/livepatch-charm-upgrade into lp:mojo/mojo-specs

[Tom Haddon]

charm-testing/canonical-livepatch: rename application to match stage so upgrade testing works

charm-testing/canonical-livepatch: rename application to match stage so upgrade testing works

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

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

[John Losito (jlosito)]

review: Approve

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

Change successfully merged at revision 160

=== modified file 'charm-testing/canonical-livepatch/deploy'
--- charm-testing/canonical-livepatch/deploy	2018-07-09 04:24:22 +0000
+++ charm-testing/canonical-livepatch/deploy	2020-02-21 16:49:47 +0000
@@ -3,7 +3,7 @@
     services:
         ubuntu:
             charm: ubuntu
-        livepatch:
+        canonical-livepatch:
             charm: canonical-livepatch
             options:
                 livepatch_key: include-file://{{local_dir}}/canonical-is-livepatch.key
@@ -16,5 +16,5 @@
 {%- endif %}
     relations:
        - ["ubuntu", "nrpe"]
-       - ["ubuntu", "livepatch"]
-       - ["livepatch", "nrpe"]
+       - ["ubuntu", "canonical-livepatch"]
+       - ["canonical-livepatch", "nrpe"]