From 532f1d48c0d8c6f9cc4601f32bfeb1b9b5e5a1e9 Mon Sep 17 00:00:00 2001 From: Billy Olsen Date: Fri, 4 Mar 2022 10:40:16 +0100 Subject: [PATCH] Update the channel names for quincy channels Update the channel for quincy channels; the channels were specified as stable/yoga which causes Juju to pick the stable charm. Fix this and point it at the right track and channel - quincy/edge in this case. Change-Id: I5d68c0c15f3a7ab5ff80ddda0d376d9031cbdb13 --- tests/bundles/focal-xena.yaml | 30 +++++++++++++++--------------- tests/bundles/focal-yoga.yaml | 30 +++++++++++++++--------------- tests/bundles/impish-xena.yaml | 30 +++++++++++++++--------------- tests/bundles/jammy-yoga.yaml | 30 +++++++++++++++--------------- 4 files changed, 60 insertions(+), 60 deletions(-) diff --git a/tests/bundles/focal-xena.yaml b/tests/bundles/focal-xena.yaml index e82685eb..5c0b9967 100644 --- a/tests/bundles/focal-xena.yaml +++ b/tests/bundles/focal-xena.yaml @@ -32,19 +32,19 @@ applications: keystone-mysql-router: charm: ch:mysql-router - channel: stable/yoga + channel: 8.0.19/edge glance-mysql-router: charm: ch:mysql-router - channel: stable/yoga + channel: 8.0.19/edge cinder-mysql-router: charm: ch:mysql-router - channel: stable/yoga + channel: 8.0.19/edge nova-cloud-controller-mysql-router: charm: ch:mysql-router - channel: stable/yoga + channel: 8.0.19/edge placement-mysql-router: charm: ch:mysql-router - channel: stable/yoga + channel: 8.0.19/edge mysql-innodb-cluster: charm: ch:mysql-innodb-cluster @@ -55,7 +55,7 @@ applications: - '0' - '1' - '2' - channel: stable/yoga + channel: 8.0.19/edge ceph-osd: charm: ch:ceph-osd @@ -69,7 +69,7 @@ applications: - '3' - '4' - '5' - channel: stable/yoga + channel: quincy/edge ceph-mon: charm: ../../ceph-mon.charm @@ -89,7 +89,7 @@ applications: source: *openstack-origin to: - '9' - channel: stable/yoga + channel: 3.9/edge keystone: expose: True @@ -99,7 +99,7 @@ applications: openstack-origin: *openstack-origin to: - '10' - channel: stable/yoga + channel: yoga/edge nova-compute: charm: ch:nova-compute @@ -109,7 +109,7 @@ applications: libvirt-image-backend: rbd to: - '11' - channel: stable/yoga + channel: yoga/edge glance: expose: True @@ -119,7 +119,7 @@ applications: openstack-origin: *openstack-origin to: - '12' - channel: stable/yoga + channel: yoga/edge cinder: expose: True @@ -131,11 +131,11 @@ applications: openstack-origin: *openstack-origin to: - '13' - channel: stable/yoga + channel: yoga/edge cinder-ceph: charm: ch:cinder-ceph - channel: stable/yoga + channel: yoga/edge nova-cloud-controller: expose: True @@ -145,7 +145,7 @@ applications: openstack-origin: *openstack-origin to: - '14' - channel: stable/yoga + channel: yoga/edge placement: charm: ch:placement @@ -154,7 +154,7 @@ applications: openstack-origin: *openstack-origin to: - '15' - channel: stable/yoga + channel: yoga/edge prometheus2: # Pin prometheus2 charm version Bug #1891942 diff --git a/tests/bundles/focal-yoga.yaml b/tests/bundles/focal-yoga.yaml index 1934967d..8599ac9f 100644 --- a/tests/bundles/focal-yoga.yaml +++ b/tests/bundles/focal-yoga.yaml @@ -32,19 +32,19 @@ applications: keystone-mysql-router: charm: ch:mysql-router - channel: stable/yoga + channel: 8.0.19/edge glance-mysql-router: charm: ch:mysql-router - channel: stable/yoga + channel: 8.0.19/edge cinder-mysql-router: charm: ch:mysql-router - channel: stable/yoga + channel: 8.0.19/edge nova-cloud-controller-mysql-router: charm: ch:mysql-router - channel: stable/yoga + channel: 8.0.19/edge placement-mysql-router: charm: ch:mysql-router - channel: stable/yoga + channel: 8.0.19/edge mysql-innodb-cluster: charm: ch:mysql-innodb-cluster @@ -55,7 +55,7 @@ applications: - '0' - '1' - '2' - channel: stable/yoga + channel: 8.0.19/edge ceph-osd: charm: ch:ceph-osd @@ -69,7 +69,7 @@ applications: - '3' - '4' - '5' - channel: stable/yoga + channel: quincy/edge ceph-mon: charm: ../../ceph-mon.charm @@ -89,7 +89,7 @@ applications: source: *openstack-origin to: - '9' - channel: stable/yoga + channel: 3.9/edge keystone: expose: True @@ -99,7 +99,7 @@ applications: openstack-origin: *openstack-origin to: - '10' - channel: stable/yoga + channel: yoga/edge nova-compute: charm: ch:nova-compute @@ -109,7 +109,7 @@ applications: libvirt-image-backend: rbd to: - '11' - channel: stable/yoga + channel: yoga/edge glance: expose: True @@ -119,7 +119,7 @@ applications: openstack-origin: *openstack-origin to: - '12' - channel: stable/yoga + channel: yoga/edge cinder: expose: True @@ -131,11 +131,11 @@ applications: openstack-origin: *openstack-origin to: - '13' - channel: stable/yoga + channel: yoga/edge cinder-ceph: charm: ch:cinder-ceph - channel: stable/yoga + channel: yoga/edge nova-cloud-controller: expose: True @@ -145,7 +145,7 @@ applications: openstack-origin: *openstack-origin to: - '14' - channel: stable/yoga + channel: yoga/edge placement: charm: ch:placement @@ -154,7 +154,7 @@ applications: openstack-origin: *openstack-origin to: - '15' - channel: stable/yoga + channel: yoga/edge prometheus2: # Pin prometheus2 charm version Bug #1891942 diff --git a/tests/bundles/impish-xena.yaml b/tests/bundles/impish-xena.yaml index 670fe090..08c59e30 100644 --- a/tests/bundles/impish-xena.yaml +++ b/tests/bundles/impish-xena.yaml @@ -33,19 +33,19 @@ applications: keystone-mysql-router: charm: ch:mysql-router - channel: stable/yoga + channel: 8.0.19/edge glance-mysql-router: charm: ch:mysql-router - channel: stable/yoga + channel: 8.0.19/edge cinder-mysql-router: charm: ch:mysql-router - channel: stable/yoga + channel: 8.0.19/edge nova-cloud-controller-mysql-router: charm: ch:mysql-router - channel: stable/yoga + channel: 8.0.19/edge placement-mysql-router: charm: ch:mysql-router - channel: stable/yoga + channel: 8.0.19/edge mysql-innodb-cluster: charm: ch:mysql-innodb-cluster @@ -56,7 +56,7 @@ applications: - '0' - '1' - '2' - channel: stable/yoga + channel: 8.0.19/edge ceph-osd: charm: ch:ceph-osd @@ -70,7 +70,7 @@ applications: - '3' - '4' - '5' - channel: stable/yoga + channel: quincy/edge ceph-mon: charm: ../../ceph-mon.charm @@ -90,7 +90,7 @@ applications: source: *openstack-origin to: - '9' - channel: stable/yoga + channel: 3.9/edge keystone: expose: True @@ -100,7 +100,7 @@ applications: openstack-origin: *openstack-origin to: - '10' - channel: stable/yoga + channel: yoga/edge nova-compute: charm: ch:nova-compute @@ -110,7 +110,7 @@ applications: libvirt-image-backend: rbd to: - '11' - channel: stable/yoga + channel: yoga/edge glance: expose: True @@ -120,7 +120,7 @@ applications: openstack-origin: *openstack-origin to: - '12' - channel: stable/yoga + channel: yoga/edge cinder: expose: True @@ -132,11 +132,11 @@ applications: openstack-origin: *openstack-origin to: - '13' - channel: stable/yoga + channel: yoga/edge cinder-ceph: charm: ch:cinder-ceph - channel: stable/yoga + channel: yoga/edge nova-cloud-controller: expose: True @@ -146,7 +146,7 @@ applications: openstack-origin: *openstack-origin to: - '14' - channel: stable/yoga + channel: yoga/edge placement: charm: ch:placement @@ -155,7 +155,7 @@ applications: openstack-origin: *openstack-origin to: - '15' - channel: stable/yoga + channel: yoga/edge prometheus2: # Pin prometheus2 charm version Bug #1891942 diff --git a/tests/bundles/jammy-yoga.yaml b/tests/bundles/jammy-yoga.yaml index 00f207ac..969abd16 100644 --- a/tests/bundles/jammy-yoga.yaml +++ b/tests/bundles/jammy-yoga.yaml @@ -33,19 +33,19 @@ applications: keystone-mysql-router: charm: ch:mysql-router - channel: stable/yoga + channel: 8.0.19/edge glance-mysql-router: charm: ch:mysql-router - channel: stable/yoga + channel: 8.0.19/edge cinder-mysql-router: charm: ch:mysql-router - channel: stable/yoga + channel: 8.0.19/edge nova-cloud-controller-mysql-router: charm: ch:mysql-router - channel: stable/yoga + channel: 8.0.19/edge placement-mysql-router: charm: ch:mysql-router - channel: stable/yoga + channel: 8.0.19/edge mysql-innodb-cluster: charm: ch:mysql-innodb-cluster @@ -56,7 +56,7 @@ applications: - '0' - '1' - '2' - channel: stable/yoga + channel: 8.0.19/edge ceph-osd: charm: ch:ceph-osd @@ -70,7 +70,7 @@ applications: - '3' - '4' - '5' - channel: stable/yoga + channel: quincy/edge ceph-mon: charm: ../../ceph-mon.charm @@ -90,7 +90,7 @@ applications: source: *openstack-origin to: - '9' - channel: stable/yoga + channel: 3.9/edge keystone: expose: True @@ -100,7 +100,7 @@ applications: openstack-origin: *openstack-origin to: - '10' - channel: stable/yoga + channel: yoga/edge nova-compute: charm: ch:nova-compute @@ -110,7 +110,7 @@ applications: libvirt-image-backend: rbd to: - '11' - channel: stable/yoga + channel: yoga/edge glance: expose: True @@ -120,7 +120,7 @@ applications: openstack-origin: *openstack-origin to: - '12' - channel: stable/yoga + channel: yoga/edge cinder: expose: True @@ -132,11 +132,11 @@ applications: openstack-origin: *openstack-origin to: - '13' - channel: stable/yoga + channel: yoga/edge cinder-ceph: charm: ch:cinder-ceph - channel: stable/yoga + channel: yoga/edge nova-cloud-controller: expose: True @@ -146,7 +146,7 @@ applications: openstack-origin: *openstack-origin to: - '14' - channel: stable/yoga + channel: yoga/edge placement: charm: ch:placement @@ -155,7 +155,7 @@ applications: openstack-origin: *openstack-origin to: - '15' - channel: stable/yoga + channel: yoga/edge prometheus2: # Pin prometheus2 charm version Bug #1891942