From f87d01015bebbc7758612f27082f4108ceb94a7d Mon Sep 17 00:00:00 2001 From: Billy Olsen Date: Fri, 11 Nov 2022 08:43:58 -0700 Subject: [PATCH] Use the default source origin for mysql & rabbit The functional test bundles specify that the mysql and rabbit services should use the openstack-origin reference field, but this is not actually relevant to the rabbit/mysql charms (e.g. it doesn't make sense to install rabbit from cloud:jammy-zed as rabbit is from the distro). Change-Id: I50693d6e85b2ce427ff184555cdfae66096f3f6c --- src/tests/bundles/jammy-zed.yaml | 4 ---- src/tests/bundles/kinetic-zed.yaml | 4 ---- 2 files changed, 8 deletions(-) diff --git a/src/tests/bundles/jammy-zed.yaml b/src/tests/bundles/jammy-zed.yaml index dd0cb60..7f457ec 100644 --- a/src/tests/bundles/jammy-zed.yaml +++ b/src/tests/bundles/jammy-zed.yaml @@ -35,8 +35,6 @@ applications: mysql-innodb-cluster: charm: ch:mysql-innodb-cluster num_units: 3 - options: - source: *openstack-origin to: - '0' - '1' @@ -46,8 +44,6 @@ applications: rabbitmq-server: charm: ch:rabbitmq-server num_units: 1 - options: - source: *openstack-origin to: - '3' channel: latest/edge diff --git a/src/tests/bundles/kinetic-zed.yaml b/src/tests/bundles/kinetic-zed.yaml index 81a5d20..2067b96 100644 --- a/src/tests/bundles/kinetic-zed.yaml +++ b/src/tests/bundles/kinetic-zed.yaml @@ -35,8 +35,6 @@ applications: mysql-innodb-cluster: charm: ch:mysql-innodb-cluster num_units: 3 - options: - source: *openstack-origin to: - '0' - '1' @@ -46,8 +44,6 @@ applications: rabbitmq-server: charm: ch:rabbitmq-server num_units: 1 - options: - source: *openstack-origin to: - '3' channel: latest/edge