From 89bdff536783255eb89a824690a0dabc758a2054 Mon Sep 17 00:00:00 2001 From: Alex Kavanagh Date: Thu, 21 Oct 2021 14:49:41 +0100 Subject: [PATCH] 21.10 - Release Remove the "channel: candidate" from the func-test bundles. Change-Id: Ic857c0089b434ca751d49dc68d0beeb3f2d4a1ed --- src/tests/bundles/bionic-rocky.yaml | 12 ------------ src/tests/bundles/bionic-stein.yaml | 12 ------------ src/tests/bundles/bionic-train.yaml | 13 ------------- src/tests/bundles/bionic-ussuri.yaml | 13 ------------- src/tests/bundles/focal-ussuri.yaml | 19 ------------------- src/tests/bundles/focal-victoria.yaml | 19 ------------------- src/tests/bundles/focal-wallaby.yaml | 19 ------------------- src/tests/bundles/focal-xena.yaml | 19 ------------------- src/tests/bundles/groovy-victoria.yaml | 19 ------------------- src/tests/bundles/hirsute-wallaby.yaml | 19 ------------------- src/tests/bundles/impish-xena.yaml | 19 ------------------- 11 files changed, 183 deletions(-) diff --git a/src/tests/bundles/bionic-rocky.yaml b/src/tests/bundles/bionic-rocky.yaml index 2b0d90b..ae4c724 100644 --- a/src/tests/bundles/bionic-rocky.yaml +++ b/src/tests/bundles/bionic-rocky.yaml @@ -67,7 +67,6 @@ applications: options: openstack-origin: cloud:bionic-rocky worker-multiplier: 0.25 - channel: candidate keystone: charm: cs:~openstack-charmers/keystone num_units: 1 @@ -75,21 +74,18 @@ applications: admin-password: openstack openstack-origin: cloud:bionic-rocky worker-multiplier: 0.25 - channel: candidate mysql: charm: cs:~openstack-charmers/percona-cluster num_units: 1 options: innodb-buffer-pool-size: 256M max-connections: 1000 - channel: candidate mysql-cell2: charm: cs:~openstack-charmers/percona-cluster num_units: 1 options: innodb-buffer-pool-size: 256M max-connections: 1000 - channel: candidate neutron-api: charm: cs:~openstack-charmers/neutron-api num_units: 1 @@ -98,7 +94,6 @@ applications: neutron-security-groups: true openstack-origin: cloud:bionic-rocky worker-multiplier: 0.25 - channel: candidate neutron-gateway: charm: cs:~openstack-charmers/neutron-gateway num_units: 1 @@ -106,11 +101,9 @@ applications: bridge-mappings: physnet1:br-ex openstack-origin: cloud:bionic-rocky worker-multiplier: 0.25 - channel: candidate neutron-openvswitch: charm: cs:~openstack-charmers/neutron-openvswitch num_units: 0 - channel: candidate nova-cloud-controller: charm: cs:~openstack-charmers/nova-cloud-controller num_units: 1 @@ -119,7 +112,6 @@ applications: openstack-origin: cloud:bionic-rocky worker-multiplier: 0.25 debug: true - channel: candidate nova-cell-controller-cell2: charm: nova-cell-controller series: bionic @@ -140,19 +132,15 @@ applications: migration-auth-type: ssh openstack-origin: cloud:bionic-rocky debug: true - channel: candidate ntp: charm: cs:ntp-24 num_units: 0 rabbitmq-server-nova: charm: cs:~openstack-charmers/rabbitmq-server num_units: 1 - channel: candidate rabbitmq-server-nova-cell2: charm: cs:~openstack-charmers/rabbitmq-server num_units: 1 - channel: candidate rabbitmq-server-neutron: charm: cs:~openstack-charmers/rabbitmq-server num_units: 1 - channel: candidate diff --git a/src/tests/bundles/bionic-stein.yaml b/src/tests/bundles/bionic-stein.yaml index 58a289f..0e6e01b 100644 --- a/src/tests/bundles/bionic-stein.yaml +++ b/src/tests/bundles/bionic-stein.yaml @@ -67,7 +67,6 @@ applications: options: openstack-origin: cloud:bionic-stein worker-multiplier: 0.25 - channel: candidate keystone: charm: cs:~openstack-charmers/keystone num_units: 1 @@ -75,21 +74,18 @@ applications: admin-password: openstack openstack-origin: cloud:bionic-stein worker-multiplier: 0.25 - channel: candidate mysql: charm: cs:~openstack-charmers/percona-cluster num_units: 1 options: innodb-buffer-pool-size: 256M max-connections: 1000 - channel: candidate mysql-cell2: charm: cs:~openstack-charmers/percona-cluster num_units: 1 options: innodb-buffer-pool-size: 256M max-connections: 1000 - channel: candidate neutron-api: charm: cs:~openstack-charmers/neutron-api num_units: 1 @@ -98,7 +94,6 @@ applications: neutron-security-groups: true openstack-origin: cloud:bionic-stein worker-multiplier: 0.25 - channel: candidate neutron-gateway: charm: cs:~openstack-charmers/neutron-gateway num_units: 1 @@ -106,11 +101,9 @@ applications: bridge-mappings: physnet1:br-ex openstack-origin: cloud:bionic-stein worker-multiplier: 0.25 - channel: candidate neutron-openvswitch: charm: cs:~openstack-charmers/neutron-openvswitch num_units: 0 - channel: candidate nova-cloud-controller: charm: cs:~openstack-charmers/nova-cloud-controller num_units: 1 @@ -119,7 +112,6 @@ applications: openstack-origin: cloud:bionic-stein worker-multiplier: 0.25 debug: true - channel: candidate nova-cell-controller-cell2: charm: nova-cell-controller series: bionic @@ -140,19 +132,15 @@ applications: migration-auth-type: ssh openstack-origin: cloud:bionic-stein debug: true - channel: candidate ntp: charm: cs:ntp-24 num_units: 0 rabbitmq-server-nova: charm: cs:~openstack-charmers/rabbitmq-server num_units: 1 - channel: candidate rabbitmq-server-nova-cell2: charm: cs:~openstack-charmers/rabbitmq-server num_units: 1 - channel: candidate rabbitmq-server-neutron: charm: cs:~openstack-charmers/rabbitmq-server num_units: 1 - channel: candidate diff --git a/src/tests/bundles/bionic-train.yaml b/src/tests/bundles/bionic-train.yaml index e101ead..2ffe81e 100644 --- a/src/tests/bundles/bionic-train.yaml +++ b/src/tests/bundles/bionic-train.yaml @@ -75,7 +75,6 @@ applications: options: openstack-origin: cloud:bionic-train worker-multiplier: 0.25 - channel: candidate keystone: charm: cs:~openstack-charmers/keystone num_units: 1 @@ -83,21 +82,18 @@ applications: admin-password: openstack openstack-origin: cloud:bionic-train worker-multiplier: 0.25 - channel: candidate mysql: charm: cs:~openstack-charmers/percona-cluster num_units: 1 options: innodb-buffer-pool-size: 256M max-connections: 1000 - channel: candidate mysql-cell2: charm: cs:~openstack-charmers/percona-cluster num_units: 1 options: innodb-buffer-pool-size: 256M max-connections: 1000 - channel: candidate neutron-api: charm: cs:~openstack-charmers/neutron-api num_units: 1 @@ -106,7 +102,6 @@ applications: neutron-security-groups: true openstack-origin: cloud:bionic-train worker-multiplier: 0.25 - channel: candidate neutron-gateway: charm: cs:~openstack-charmers/neutron-gateway num_units: 1 @@ -114,11 +109,9 @@ applications: bridge-mappings: physnet1:br-ex openstack-origin: cloud:bionic-train worker-multiplier: 0.25 - channel: candidate neutron-openvswitch: charm: cs:~openstack-charmers/neutron-openvswitch num_units: 0 - channel: candidate nova-cloud-controller: charm: cs:~openstack-charmers/nova-cloud-controller num_units: 1 @@ -127,7 +120,6 @@ applications: openstack-origin: cloud:bionic-train worker-multiplier: 0.25 debug: true - channel: candidate nova-cell-controller-cell2: charm: nova-cell-controller series: bionic @@ -148,22 +140,18 @@ applications: migration-auth-type: ssh openstack-origin: cloud:bionic-train debug: true - channel: candidate ntp: charm: cs:ntp-24 num_units: 0 rabbitmq-server-nova: charm: cs:~openstack-charmers/rabbitmq-server num_units: 1 - channel: candidate rabbitmq-server-nova-cell2: charm: cs:~openstack-charmers/rabbitmq-server num_units: 1 - channel: candidate rabbitmq-server-neutron: charm: cs:~openstack-charmers/rabbitmq-server num_units: 1 - channel: candidate placement: charm: cs:~openstack-charmers/placement num_units: 1 @@ -171,4 +159,3 @@ applications: options: openstack-origin: cloud:bionic-train debug: true - channel: candidate diff --git a/src/tests/bundles/bionic-ussuri.yaml b/src/tests/bundles/bionic-ussuri.yaml index 33305f3..5313182 100644 --- a/src/tests/bundles/bionic-ussuri.yaml +++ b/src/tests/bundles/bionic-ussuri.yaml @@ -75,7 +75,6 @@ applications: options: openstack-origin: cloud:bionic-ussuri worker-multiplier: 0.25 - channel: candidate keystone: charm: cs:~openstack-charmers/keystone num_units: 1 @@ -83,21 +82,18 @@ applications: admin-password: openstack openstack-origin: cloud:bionic-ussuri worker-multiplier: 0.25 - channel: candidate mysql: charm: cs:~openstack-charmers/percona-cluster num_units: 1 options: innodb-buffer-pool-size: 256M max-connections: 1000 - channel: candidate mysql-cell2: charm: cs:~openstack-charmers/percona-cluster num_units: 1 options: innodb-buffer-pool-size: 256M max-connections: 1000 - channel: candidate neutron-api: charm: cs:~openstack-charmers/neutron-api num_units: 1 @@ -108,7 +104,6 @@ applications: neutron-security-groups: true openstack-origin: cloud:bionic-ussuri worker-multiplier: 0.25 - channel: candidate neutron-gateway: charm: cs:~openstack-charmers/neutron-gateway num_units: 1 @@ -116,11 +111,9 @@ applications: bridge-mappings: physnet1:br-ex openstack-origin: cloud:bionic-ussuri worker-multiplier: 0.25 - channel: candidate neutron-openvswitch: charm: cs:~openstack-charmers/neutron-openvswitch num_units: 0 - channel: candidate nova-cloud-controller: charm: cs:~openstack-charmers/nova-cloud-controller num_units: 1 @@ -129,7 +122,6 @@ applications: openstack-origin: cloud:bionic-ussuri worker-multiplier: 0.25 debug: true - channel: candidate nova-cell-controller-cell2: charm: nova-cell-controller series: bionic @@ -150,22 +142,18 @@ applications: migration-auth-type: ssh openstack-origin: cloud:bionic-ussuri debug: true - channel: candidate ntp: charm: cs:ntp-24 num_units: 0 rabbitmq-server-nova: charm: cs:~openstack-charmers/rabbitmq-server num_units: 1 - channel: candidate rabbitmq-server-nova-cell2: charm: cs:~openstack-charmers/rabbitmq-server num_units: 1 - channel: candidate rabbitmq-server-neutron: charm: cs:~openstack-charmers/rabbitmq-server num_units: 1 - channel: candidate placement: charm: cs:~openstack-charmers/placement num_units: 1 @@ -173,4 +161,3 @@ applications: options: openstack-origin: cloud:bionic-ussuri debug: true - channel: candidate diff --git a/src/tests/bundles/focal-ussuri.yaml b/src/tests/bundles/focal-ussuri.yaml index 009cc30..c43d4a5 100644 --- a/src/tests/bundles/focal-ussuri.yaml +++ b/src/tests/bundles/focal-ussuri.yaml @@ -36,24 +36,18 @@ applications: keystone-mysql-router: charm: cs:~openstack-charmers/mysql-router - channel: candidate neutron-api-mysql-router: charm: cs:~openstack-charmers/mysql-router - channel: candidate glance-mysql-router: charm: cs:~openstack-charmers/mysql-router - channel: candidate nova-cloud-controller-mysql-router: charm: cs:~openstack-charmers/mysql-router - channel: candidate nova-cell-controller-cell2-mysql-router: charm: cs:~openstack-charmers/mysql-router options: base-port: 3316 - channel: candidate placement-mysql-router: charm: cs:~openstack-charmers/mysql-router - channel: candidate mysql-innodb-cluster: charm: cs:~openstack-charmers/mysql-innodb-cluster @@ -64,7 +58,6 @@ applications: - '0' - '1' - '2' - channel: candidate mysql-innodb-cluster-cell2: charm: cs:~openstack-charmers/mysql-innodb-cluster @@ -75,7 +68,6 @@ applications: - '3' - '4' - '5' - channel: candidate glance: charm: cs:~openstack-charmers/glance @@ -85,7 +77,6 @@ applications: worker-multiplier: 0.25 to: - '6' - channel: candidate keystone: charm: cs:~openstack-charmers/keystone @@ -96,7 +87,6 @@ applications: worker-multiplier: 0.25 to: - '7' - channel: candidate neutron-api: charm: cs:~openstack-charmers/neutron-api @@ -110,7 +100,6 @@ applications: worker-multiplier: 0.25 to: - '8' - channel: candidate neutron-gateway: charm: cs:~openstack-charmers/neutron-gateway @@ -121,12 +110,10 @@ applications: worker-multiplier: 0.25 to: - '9' - channel: candidate neutron-openvswitch: charm: cs:~openstack-charmers/neutron-openvswitch num_units: 0 - channel: candidate nova-cloud-controller: charm: cs:~openstack-charmers/nova-cloud-controller @@ -138,7 +125,6 @@ applications: debug: true to: - '10' - channel: candidate nova-cell-controller-cell2: charm: nova-cell-controller @@ -164,28 +150,24 @@ applications: debug: true to: - '12' - channel: candidate rabbitmq-server-nova: charm: cs:~openstack-charmers/rabbitmq-server num_units: 1 to: - '13' - channel: candidate rabbitmq-server-nova-cell2: charm: cs:~openstack-charmers/rabbitmq-server num_units: 1 to: - '14' - channel: candidate rabbitmq-server-neutron: charm: cs:~openstack-charmers/rabbitmq-server num_units: 1 to: - '15' - channel: candidate placement: charm: cs:~openstack-charmers/placement @@ -195,7 +177,6 @@ applications: debug: true to: - '16' - channel: candidate relations: diff --git a/src/tests/bundles/focal-victoria.yaml b/src/tests/bundles/focal-victoria.yaml index a0c2381..d3c6d53 100644 --- a/src/tests/bundles/focal-victoria.yaml +++ b/src/tests/bundles/focal-victoria.yaml @@ -36,24 +36,18 @@ applications: keystone-mysql-router: charm: cs:~openstack-charmers/mysql-router - channel: candidate neutron-api-mysql-router: charm: cs:~openstack-charmers/mysql-router - channel: candidate glance-mysql-router: charm: cs:~openstack-charmers/mysql-router - channel: candidate nova-cloud-controller-mysql-router: charm: cs:~openstack-charmers/mysql-router - channel: candidate nova-cell-controller-cell2-mysql-router: charm: cs:~openstack-charmers/mysql-router options: base-port: 3316 - channel: candidate placement-mysql-router: charm: cs:~openstack-charmers/mysql-router - channel: candidate mysql-innodb-cluster: charm: cs:~openstack-charmers/mysql-innodb-cluster @@ -64,7 +58,6 @@ applications: - '0' - '1' - '2' - channel: candidate mysql-innodb-cluster-cell2: charm: cs:~openstack-charmers/mysql-innodb-cluster @@ -75,7 +68,6 @@ applications: - '3' - '4' - '5' - channel: candidate glance: charm: cs:~openstack-charmers/glance @@ -85,7 +77,6 @@ applications: worker-multiplier: 0.25 to: - '6' - channel: candidate keystone: charm: cs:~openstack-charmers/keystone @@ -96,7 +87,6 @@ applications: worker-multiplier: 0.25 to: - '7' - channel: candidate neutron-api: charm: cs:~openstack-charmers/neutron-api @@ -110,7 +100,6 @@ applications: worker-multiplier: 0.25 to: - '8' - channel: candidate neutron-gateway: charm: cs:~openstack-charmers/neutron-gateway @@ -121,12 +110,10 @@ applications: worker-multiplier: 0.25 to: - '9' - channel: candidate neutron-openvswitch: charm: cs:~openstack-charmers/neutron-openvswitch num_units: 0 - channel: candidate nova-cloud-controller: charm: cs:~openstack-charmers/nova-cloud-controller @@ -138,7 +125,6 @@ applications: debug: true to: - '10' - channel: candidate nova-cell-controller-cell2: charm: nova-cell-controller @@ -164,28 +150,24 @@ applications: debug: true to: - '12' - channel: candidate rabbitmq-server-nova: charm: cs:~openstack-charmers/rabbitmq-server num_units: 1 to: - '13' - channel: candidate rabbitmq-server-nova-cell2: charm: cs:~openstack-charmers/rabbitmq-server num_units: 1 to: - '14' - channel: candidate rabbitmq-server-neutron: charm: cs:~openstack-charmers/rabbitmq-server num_units: 1 to: - '15' - channel: candidate placement: charm: cs:~openstack-charmers/placement @@ -195,7 +177,6 @@ applications: debug: true to: - '16' - channel: candidate relations: diff --git a/src/tests/bundles/focal-wallaby.yaml b/src/tests/bundles/focal-wallaby.yaml index fd70f6f..163c3e6 100644 --- a/src/tests/bundles/focal-wallaby.yaml +++ b/src/tests/bundles/focal-wallaby.yaml @@ -36,24 +36,18 @@ applications: keystone-mysql-router: charm: cs:~openstack-charmers/mysql-router - channel: candidate neutron-api-mysql-router: charm: cs:~openstack-charmers/mysql-router - channel: candidate glance-mysql-router: charm: cs:~openstack-charmers/mysql-router - channel: candidate nova-cloud-controller-mysql-router: charm: cs:~openstack-charmers/mysql-router - channel: candidate nova-cell-controller-cell2-mysql-router: charm: cs:~openstack-charmers/mysql-router options: base-port: 3316 - channel: candidate placement-mysql-router: charm: cs:~openstack-charmers/mysql-router - channel: candidate mysql-innodb-cluster: charm: cs:~openstack-charmers/mysql-innodb-cluster @@ -64,7 +58,6 @@ applications: - '0' - '1' - '2' - channel: candidate mysql-innodb-cluster-cell2: charm: cs:~openstack-charmers/mysql-innodb-cluster @@ -75,7 +68,6 @@ applications: - '3' - '4' - '5' - channel: candidate glance: charm: cs:~openstack-charmers/glance @@ -85,7 +77,6 @@ applications: worker-multiplier: 0.25 to: - '6' - channel: candidate keystone: charm: cs:~openstack-charmers/keystone @@ -96,7 +87,6 @@ applications: worker-multiplier: 0.25 to: - '7' - channel: candidate neutron-api: charm: cs:~openstack-charmers/neutron-api @@ -110,7 +100,6 @@ applications: worker-multiplier: 0.25 to: - '8' - channel: candidate neutron-gateway: charm: cs:~openstack-charmers/neutron-gateway @@ -121,12 +110,10 @@ applications: worker-multiplier: 0.25 to: - '9' - channel: candidate neutron-openvswitch: charm: cs:~openstack-charmers/neutron-openvswitch num_units: 0 - channel: candidate nova-cloud-controller: charm: cs:~openstack-charmers/nova-cloud-controller @@ -138,7 +125,6 @@ applications: debug: true to: - '10' - channel: candidate nova-cell-controller-cell2: charm: nova-cell-controller @@ -164,28 +150,24 @@ applications: debug: true to: - '12' - channel: candidate rabbitmq-server-nova: charm: cs:~openstack-charmers/rabbitmq-server num_units: 1 to: - '13' - channel: candidate rabbitmq-server-nova-cell2: charm: cs:~openstack-charmers/rabbitmq-server num_units: 1 to: - '14' - channel: candidate rabbitmq-server-neutron: charm: cs:~openstack-charmers/rabbitmq-server num_units: 1 to: - '15' - channel: candidate placement: charm: cs:~openstack-charmers/placement @@ -195,7 +177,6 @@ applications: debug: true to: - '16' - channel: candidate relations: diff --git a/src/tests/bundles/focal-xena.yaml b/src/tests/bundles/focal-xena.yaml index 800ceae..f94d869 100644 --- a/src/tests/bundles/focal-xena.yaml +++ b/src/tests/bundles/focal-xena.yaml @@ -36,24 +36,18 @@ applications: keystone-mysql-router: charm: cs:~openstack-charmers/mysql-router - channel: candidate neutron-api-mysql-router: charm: cs:~openstack-charmers/mysql-router - channel: candidate glance-mysql-router: charm: cs:~openstack-charmers/mysql-router - channel: candidate nova-cloud-controller-mysql-router: charm: cs:~openstack-charmers/mysql-router - channel: candidate nova-cell-controller-cell2-mysql-router: charm: cs:~openstack-charmers/mysql-router options: base-port: 3316 - channel: candidate placement-mysql-router: charm: cs:~openstack-charmers/mysql-router - channel: candidate mysql-innodb-cluster: charm: cs:~openstack-charmers/mysql-innodb-cluster @@ -64,7 +58,6 @@ applications: - '0' - '1' - '2' - channel: candidate mysql-innodb-cluster-cell2: charm: cs:~openstack-charmers/mysql-innodb-cluster @@ -75,7 +68,6 @@ applications: - '3' - '4' - '5' - channel: candidate glance: charm: cs:~openstack-charmers/glance @@ -85,7 +77,6 @@ applications: worker-multiplier: 0.25 to: - '6' - channel: candidate keystone: charm: cs:~openstack-charmers/keystone @@ -96,7 +87,6 @@ applications: worker-multiplier: 0.25 to: - '7' - channel: candidate neutron-api: charm: cs:~openstack-charmers/neutron-api @@ -110,7 +100,6 @@ applications: worker-multiplier: 0.25 to: - '8' - channel: candidate neutron-gateway: charm: cs:~openstack-charmers/neutron-gateway @@ -121,12 +110,10 @@ applications: worker-multiplier: 0.25 to: - '9' - channel: candidate neutron-openvswitch: charm: cs:~openstack-charmers/neutron-openvswitch num_units: 0 - channel: candidate nova-cloud-controller: charm: cs:~openstack-charmers/nova-cloud-controller @@ -138,7 +125,6 @@ applications: debug: true to: - '10' - channel: candidate nova-cell-controller-cell2: charm: nova-cell-controller @@ -164,28 +150,24 @@ applications: debug: true to: - '12' - channel: candidate rabbitmq-server-nova: charm: cs:~openstack-charmers/rabbitmq-server num_units: 1 to: - '13' - channel: candidate rabbitmq-server-nova-cell2: charm: cs:~openstack-charmers/rabbitmq-server num_units: 1 to: - '14' - channel: candidate rabbitmq-server-neutron: charm: cs:~openstack-charmers/rabbitmq-server num_units: 1 to: - '15' - channel: candidate placement: charm: cs:~openstack-charmers/placement @@ -195,7 +177,6 @@ applications: debug: true to: - '16' - channel: candidate relations: diff --git a/src/tests/bundles/groovy-victoria.yaml b/src/tests/bundles/groovy-victoria.yaml index 0880274..f619fe0 100644 --- a/src/tests/bundles/groovy-victoria.yaml +++ b/src/tests/bundles/groovy-victoria.yaml @@ -36,24 +36,18 @@ applications: keystone-mysql-router: charm: cs:~openstack-charmers/mysql-router - channel: candidate neutron-api-mysql-router: charm: cs:~openstack-charmers/mysql-router - channel: candidate glance-mysql-router: charm: cs:~openstack-charmers/mysql-router - channel: candidate nova-cloud-controller-mysql-router: charm: cs:~openstack-charmers/mysql-router - channel: candidate nova-cell-controller-cell2-mysql-router: charm: cs:~openstack-charmers/mysql-router options: base-port: 3316 - channel: candidate placement-mysql-router: charm: cs:~openstack-charmers/mysql-router - channel: candidate mysql-innodb-cluster: charm: cs:~openstack-charmers/mysql-innodb-cluster @@ -64,7 +58,6 @@ applications: - '0' - '1' - '2' - channel: candidate mysql-innodb-cluster-cell2: charm: cs:~openstack-charmers/mysql-innodb-cluster @@ -75,7 +68,6 @@ applications: - '3' - '4' - '5' - channel: candidate glance: charm: cs:~openstack-charmers/glance @@ -85,7 +77,6 @@ applications: worker-multiplier: 0.25 to: - '6' - channel: candidate keystone: charm: cs:~openstack-charmers/keystone @@ -96,7 +87,6 @@ applications: worker-multiplier: 0.25 to: - '7' - channel: candidate neutron-api: charm: cs:~openstack-charmers/neutron-api @@ -110,7 +100,6 @@ applications: worker-multiplier: 0.25 to: - '8' - channel: candidate neutron-gateway: charm: cs:~openstack-charmers/neutron-gateway @@ -121,12 +110,10 @@ applications: worker-multiplier: 0.25 to: - '9' - channel: candidate neutron-openvswitch: charm: cs:~openstack-charmers/neutron-openvswitch num_units: 0 - channel: candidate nova-cloud-controller: charm: cs:~openstack-charmers/nova-cloud-controller @@ -138,7 +125,6 @@ applications: debug: true to: - '10' - channel: candidate nova-cell-controller-cell2: charm: nova-cell-controller @@ -164,28 +150,24 @@ applications: debug: true to: - '12' - channel: candidate rabbitmq-server-nova: charm: cs:~openstack-charmers/rabbitmq-server num_units: 1 to: - '13' - channel: candidate rabbitmq-server-nova-cell2: charm: cs:~openstack-charmers/rabbitmq-server num_units: 1 to: - '14' - channel: candidate rabbitmq-server-neutron: charm: cs:~openstack-charmers/rabbitmq-server num_units: 1 to: - '15' - channel: candidate placement: charm: cs:~openstack-charmers/placement @@ -195,7 +177,6 @@ applications: debug: true to: - '16' - channel: candidate relations: diff --git a/src/tests/bundles/hirsute-wallaby.yaml b/src/tests/bundles/hirsute-wallaby.yaml index a913e0e..4da766c 100644 --- a/src/tests/bundles/hirsute-wallaby.yaml +++ b/src/tests/bundles/hirsute-wallaby.yaml @@ -36,24 +36,18 @@ applications: keystone-mysql-router: charm: cs:~openstack-charmers/mysql-router - channel: candidate neutron-api-mysql-router: charm: cs:~openstack-charmers/mysql-router - channel: candidate glance-mysql-router: charm: cs:~openstack-charmers/mysql-router - channel: candidate nova-cloud-controller-mysql-router: charm: cs:~openstack-charmers/mysql-router - channel: candidate nova-cell-controller-cell2-mysql-router: charm: cs:~openstack-charmers/mysql-router options: base-port: 3316 - channel: candidate placement-mysql-router: charm: cs:~openstack-charmers/mysql-router - channel: candidate mysql-innodb-cluster: charm: cs:~openstack-charmers/mysql-innodb-cluster @@ -64,7 +58,6 @@ applications: - '0' - '1' - '2' - channel: candidate mysql-innodb-cluster-cell2: charm: cs:~openstack-charmers/mysql-innodb-cluster @@ -75,7 +68,6 @@ applications: - '3' - '4' - '5' - channel: candidate glance: charm: cs:~openstack-charmers/glance @@ -85,7 +77,6 @@ applications: worker-multiplier: 0.25 to: - '6' - channel: candidate keystone: charm: cs:~openstack-charmers/keystone @@ -96,7 +87,6 @@ applications: worker-multiplier: 0.25 to: - '7' - channel: candidate neutron-api: charm: cs:~openstack-charmers/neutron-api @@ -110,7 +100,6 @@ applications: worker-multiplier: 0.25 to: - '8' - channel: candidate neutron-gateway: charm: cs:~openstack-charmers/neutron-gateway @@ -121,12 +110,10 @@ applications: worker-multiplier: 0.25 to: - '9' - channel: candidate neutron-openvswitch: charm: cs:~openstack-charmers/neutron-openvswitch num_units: 0 - channel: candidate nova-cloud-controller: charm: cs:~openstack-charmers/nova-cloud-controller @@ -138,7 +125,6 @@ applications: debug: true to: - '10' - channel: candidate nova-cell-controller-cell2: charm: nova-cell-controller @@ -164,28 +150,24 @@ applications: debug: true to: - '12' - channel: candidate rabbitmq-server-nova: charm: cs:~openstack-charmers/rabbitmq-server num_units: 1 to: - '13' - channel: candidate rabbitmq-server-nova-cell2: charm: cs:~openstack-charmers/rabbitmq-server num_units: 1 to: - '14' - channel: candidate rabbitmq-server-neutron: charm: cs:~openstack-charmers/rabbitmq-server num_units: 1 to: - '15' - channel: candidate placement: charm: cs:~openstack-charmers/placement @@ -195,7 +177,6 @@ applications: debug: true to: - '16' - channel: candidate relations: diff --git a/src/tests/bundles/impish-xena.yaml b/src/tests/bundles/impish-xena.yaml index 3ae2be1..92638ee 100644 --- a/src/tests/bundles/impish-xena.yaml +++ b/src/tests/bundles/impish-xena.yaml @@ -36,24 +36,18 @@ applications: keystone-mysql-router: charm: cs:~openstack-charmers/mysql-router - channel: candidate neutron-api-mysql-router: charm: cs:~openstack-charmers/mysql-router - channel: candidate glance-mysql-router: charm: cs:~openstack-charmers/mysql-router - channel: candidate nova-cloud-controller-mysql-router: charm: cs:~openstack-charmers/mysql-router - channel: candidate nova-cell-controller-cell2-mysql-router: charm: cs:~openstack-charmers/mysql-router options: base-port: 3316 - channel: candidate placement-mysql-router: charm: cs:~openstack-charmers/mysql-router - channel: candidate mysql-innodb-cluster: charm: cs:~openstack-charmers/mysql-innodb-cluster @@ -64,7 +58,6 @@ applications: - '0' - '1' - '2' - channel: candidate mysql-innodb-cluster-cell2: charm: cs:~openstack-charmers/mysql-innodb-cluster @@ -75,7 +68,6 @@ applications: - '3' - '4' - '5' - channel: candidate glance: charm: cs:~openstack-charmers/glance @@ -85,7 +77,6 @@ applications: worker-multiplier: 0.25 to: - '6' - channel: candidate keystone: charm: cs:~openstack-charmers/keystone @@ -96,7 +87,6 @@ applications: worker-multiplier: 0.25 to: - '7' - channel: candidate neutron-api: charm: cs:~openstack-charmers/neutron-api @@ -110,7 +100,6 @@ applications: worker-multiplier: 0.25 to: - '8' - channel: candidate neutron-gateway: charm: cs:~openstack-charmers/neutron-gateway @@ -121,12 +110,10 @@ applications: worker-multiplier: 0.25 to: - '9' - channel: candidate neutron-openvswitch: charm: cs:~openstack-charmers/neutron-openvswitch num_units: 0 - channel: candidate nova-cloud-controller: charm: cs:~openstack-charmers/nova-cloud-controller @@ -138,7 +125,6 @@ applications: debug: true to: - '10' - channel: candidate nova-cell-controller-cell2: charm: nova-cell-controller @@ -164,28 +150,24 @@ applications: debug: true to: - '12' - channel: candidate rabbitmq-server-nova: charm: cs:~openstack-charmers/rabbitmq-server num_units: 1 to: - '13' - channel: candidate rabbitmq-server-nova-cell2: charm: cs:~openstack-charmers/rabbitmq-server num_units: 1 to: - '14' - channel: candidate rabbitmq-server-neutron: charm: cs:~openstack-charmers/rabbitmq-server num_units: 1 to: - '15' - channel: candidate placement: charm: cs:~openstack-charmers/placement @@ -195,7 +177,6 @@ applications: debug: true to: - '16' - channel: candidate relations: