From cd5e69eb9a9543e6cff2924e30f9826a23197404 Mon Sep 17 00:00:00 2001 From: Felipe Reyes Date: Mon, 17 Oct 2022 22:16:29 -0300 Subject: [PATCH] Update bundles to use yoga This change reconfigures the bundles to use OpenStack yoga, they are the last version that support Focal and Jammy. Func-Test-Pr: https://github.com/openstack-charmers/zaza-openstack-tests/pull/958 Change-Id: Ia54bfacee6635c1e85a0c97e22bc2a5974bda7d1 Closes-Bug: #1991528 (cherry picked from commit f22bb10257d7948f9222e73ff471c56809d0cd88) --- tests/bundles/focal-yoga.yaml | 8 ++++---- tests/bundles/jammy-yoga.yaml | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/tests/bundles/focal-yoga.yaml b/tests/bundles/focal-yoga.yaml index 58851f9e..eecd4b64 100644 --- a/tests/bundles/focal-yoga.yaml +++ b/tests/bundles/focal-yoga.yaml @@ -65,7 +65,7 @@ applications: openstack-origin: *openstack-origin to: - '6' - channel: latest/edge + channel: yoga/edge keystone: charm: ch:keystone @@ -75,17 +75,17 @@ applications: admin-password: openstack to: - '7' - channel: latest/edge + channel: yoga/edge nagios: - charm: cs:nagios + charm: ch:nagios series: bionic # not supported on focal yet num_units: 1 to: - '8' nrpe: - charm: cs:nrpe + charm: ch:nrpe relations: diff --git a/tests/bundles/jammy-yoga.yaml b/tests/bundles/jammy-yoga.yaml index 32298445..504c2057 100644 --- a/tests/bundles/jammy-yoga.yaml +++ b/tests/bundles/jammy-yoga.yaml @@ -63,7 +63,7 @@ applications: openstack-origin: *openstack-origin to: - '6' - channel: latest/edge + channel: yoga/edge keystone: charm: ch:keystone @@ -73,7 +73,7 @@ applications: admin-password: openstack to: - '7' - channel: latest/edge + channel: yoga/edge relations: