From d4b94a6bf4e5bcb5a0661867b6884966f6cc7ffd Mon Sep 17 00:00:00 2001
From: James Page <james.page@canonical.com>
Date: Tue, 22 Nov 2022 14:27:39 +0000
Subject: [PATCH] Upgrade to OpenStack Yoga

Update OCI image.

Update OSCI publication target to yoga/edge.

Misc doc updates.

Change-Id: Idd2909cdb15f1bc1081d824ea163a74ecd51d3cd
---
 charms/horizon-k8s/CONTRIBUTING.md | 2 +-
 charms/horizon-k8s/README.md       | 2 +-
 charms/horizon-k8s/metadata.yaml   | 4 ++--
 charms/horizon-k8s/osci.yaml       | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/charms/horizon-k8s/CONTRIBUTING.md b/charms/horizon-k8s/CONTRIBUTING.md
index fa5b4fe5..098b74cb 100644
--- a/charms/horizon-k8s/CONTRIBUTING.md
+++ b/charms/horizon-k8s/CONTRIBUTING.md
@@ -45,7 +45,7 @@ run:
 
 To deploy the local test instance:
 
-    juju deploy ./horizon-k8s_ubuntu-20.04-amd64.charm --trust --resource openstack-dashboard-image=kolla/ubuntu-binary-horizon:xena
+    juju deploy ./horizon-k8s_ubuntu-20.04-amd64.charm --trust --resource openstack-dashboard-image=kolla/ubuntu-binary-horizon:yoga
 
 <!-- LINKS -->
 
diff --git a/charms/horizon-k8s/README.md b/charms/horizon-k8s/README.md
index 458f0f23..2385b16c 100644
--- a/charms/horizon-k8s/README.md
+++ b/charms/horizon-k8s/README.md
@@ -44,7 +44,7 @@ horizon-k8s requires the following relations:
 
 ## OCI Images
 
-The charm by default uses `docker.io/kolla/ubuntu-binary-horizon:xena` image.
+The charm by default uses `docker.io/kolla/ubuntu-binary-horizon:yoga` image.
 
 ## Contributing
 
diff --git a/charms/horizon-k8s/metadata.yaml b/charms/horizon-k8s/metadata.yaml
index 4dc332b5..bebe5b64 100644
--- a/charms/horizon-k8s/metadata.yaml
+++ b/charms/horizon-k8s/metadata.yaml
@@ -23,8 +23,8 @@ resources:
   openstack-dashboard-image:
     type: oci-image
     description: OCI image for OpenStack Dashboard
-    # docker.io/kolla/ubuntu-binary-horizon:xena
-    upstream-source: docker.io/kolla/ubuntu-binary-horizon@sha256:3385e3d30382a4f7f4603597b8c6bdd19523b03487ad8e2383c447659b1aab61
+    # docker.io/kolla/ubuntu-binary-horizon:yoga
+    upstream-source: docker.io/kolla/ubuntu-binary-horizon@sha256:85fde22e0d1e66c8333eb7ce3371a3aa32248b13186928540535b020693bce2b
 
 requires:
   database:
diff --git a/charms/horizon-k8s/osci.yaml b/charms/horizon-k8s/osci.yaml
index bfe2e032..a9cb8c34 100644
--- a/charms/horizon-k8s/osci.yaml
+++ b/charms/horizon-k8s/osci.yaml
@@ -9,4 +9,4 @@
       build_type: charmcraft
       publish_charm: true
       charmcraft_channel: 2.0/stable
-      publish_channel: xena/edge
+      publish_channel: yoga/edge