From e4af560e1c61178d4e8ab098f563efeb0dfb2c4d 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: I7b13857378d60b9dfcaa4c44156550994f744af0 --- tests/bundles/bionic-queens.yaml | 8 -------- tests/bundles/bionic-rocky.yaml | 8 -------- tests/bundles/bionic-stein.yaml | 8 -------- tests/bundles/bionic-train.yaml | 9 --------- tests/bundles/bionic-ussuri.yaml | 9 --------- tests/bundles/focal-ussuri.yaml | 16 ---------------- tests/bundles/focal-victoria.yaml | 16 ---------------- tests/bundles/focal-wallaby.yaml | 16 ---------------- tests/bundles/focal-xena.yaml | 16 ---------------- tests/bundles/groovy-victoria.yaml | 16 ---------------- tests/bundles/hirsute-wallaby.yaml | 16 ---------------- tests/bundles/impish-xena.yaml | 16 ---------------- tests/bundles/xenial-mitaka.yaml | 8 -------- tests/bundles/xenial-ocata.yaml | 8 -------- tests/bundles/xenial-pike.yaml | 8 -------- tests/bundles/xenial-queens.yaml | 8 -------- 16 files changed, 186 deletions(-) diff --git a/tests/bundles/bionic-queens.yaml b/tests/bundles/bionic-queens.yaml index 4575b693..e957ffce 100644 --- a/tests/bundles/bionic-queens.yaml +++ b/tests/bundles/bionic-queens.yaml @@ -42,7 +42,6 @@ applications: rabbitmq-server: charm: cs:~openstack-charmers/rabbitmq-server num_units: 1 - channel: candidate percona-cluster: charm: cs:~openstack-charmers/percona-cluster num_units: 1 @@ -52,7 +51,6 @@ applications: dataset-size: 25% root-password: ChangeMe123 sst-password: ChangeMe123 - channel: candidate nova-cloud-controller: charm: ../../../nova-cloud-controller num_units: 1 @@ -68,24 +66,19 @@ applications: options: flat-network-providers: physnet1 neutron-security-groups: true - channel: candidate keystone: charm: cs:~openstack-charmers/keystone num_units: 1 - channel: candidate neutron-gateway: charm: cs:~openstack-charmers/neutron-gateway num_units: 1 options: bridge-mappings: physnet1:br-ex - channel: candidate glance: charm: cs:~openstack-charmers/glance num_units: 1 - channel: candidate neutron-openvswitch: charm: cs:~openstack-charmers/neutron-openvswitch - channel: candidate nova-compute: charm: cs:~openstack-charmers/nova-compute num_units: 2 @@ -97,4 +90,3 @@ applications: ephemeral-device: /dev/vdb ephemeral-unmount: /mnt debug: true - channel: candidate diff --git a/tests/bundles/bionic-rocky.yaml b/tests/bundles/bionic-rocky.yaml index 644b6ab5..8ddfbf20 100644 --- a/tests/bundles/bionic-rocky.yaml +++ b/tests/bundles/bionic-rocky.yaml @@ -42,7 +42,6 @@ applications: rabbitmq-server: charm: cs:~openstack-charmers/rabbitmq-server num_units: 1 - channel: candidate percona-cluster: charm: cs:~openstack-charmers/percona-cluster num_units: 1 @@ -52,7 +51,6 @@ applications: dataset-size: 25% root-password: ChangeMe123 sst-password: ChangeMe123 - channel: candidate nova-cloud-controller: charm: ../../../nova-cloud-controller num_units: 1 @@ -70,29 +68,24 @@ applications: openstack-origin: cloud:bionic-rocky flat-network-providers: physnet1 neutron-security-groups: true - channel: candidate keystone: charm: cs:~openstack-charmers/keystone num_units: 1 options: openstack-origin: cloud:bionic-rocky - channel: candidate neutron-gateway: charm: cs:~openstack-charmers/neutron-gateway num_units: 1 options: openstack-origin: cloud:bionic-rocky bridge-mappings: physnet1:br-ex - channel: candidate glance: charm: cs:~openstack-charmers/glance num_units: 1 options: openstack-origin: cloud:bionic-rocky - channel: candidate neutron-openvswitch: charm: cs:~openstack-charmers/neutron-openvswitch - channel: candidate nova-compute: charm: cs:~openstack-charmers/nova-compute num_units: 2 @@ -105,4 +98,3 @@ applications: ephemeral-device: /dev/vdb ephemeral-unmount: /mnt debug: true - channel: candidate diff --git a/tests/bundles/bionic-stein.yaml b/tests/bundles/bionic-stein.yaml index 18086013..499ab1b7 100644 --- a/tests/bundles/bionic-stein.yaml +++ b/tests/bundles/bionic-stein.yaml @@ -42,7 +42,6 @@ applications: rabbitmq-server: charm: cs:~openstack-charmers/rabbitmq-server num_units: 1 - channel: candidate percona-cluster: charm: cs:~openstack-charmers/percona-cluster num_units: 1 @@ -52,7 +51,6 @@ applications: dataset-size: 25% root-password: ChangeMe123 sst-password: ChangeMe123 - channel: candidate nova-cloud-controller: charm: ../../../nova-cloud-controller num_units: 1 @@ -70,29 +68,24 @@ applications: openstack-origin: cloud:bionic-stein flat-network-providers: physnet1 neutron-security-groups: true - channel: candidate keystone: charm: cs:~openstack-charmers/keystone num_units: 1 options: openstack-origin: cloud:bionic-stein - channel: candidate neutron-gateway: charm: cs:~openstack-charmers/neutron-gateway num_units: 1 options: openstack-origin: cloud:bionic-stein bridge-mappings: physnet1:br-ex - channel: candidate glance: charm: cs:~openstack-charmers/glance num_units: 1 options: openstack-origin: cloud:bionic-stein - channel: candidate neutron-openvswitch: charm: cs:~openstack-charmers/neutron-openvswitch - channel: candidate nova-compute: charm: cs:~openstack-charmers/nova-compute num_units: 2 @@ -105,4 +98,3 @@ applications: ephemeral-device: /dev/vdb ephemeral-unmount: /mnt debug: true - channel: candidate diff --git a/tests/bundles/bionic-train.yaml b/tests/bundles/bionic-train.yaml index 61ea34e7..54026307 100644 --- a/tests/bundles/bionic-train.yaml +++ b/tests/bundles/bionic-train.yaml @@ -48,7 +48,6 @@ applications: rabbitmq-server: charm: cs:~openstack-charmers/rabbitmq-server num_units: 1 - channel: candidate percona-cluster: charm: cs:~openstack-charmers/percona-cluster num_units: 1 @@ -58,7 +57,6 @@ applications: dataset-size: 25% root-password: ChangeMe123 sst-password: ChangeMe123 - channel: candidate nova-cloud-controller: charm: ../../../nova-cloud-controller num_units: 1 @@ -76,35 +74,29 @@ applications: openstack-origin: cloud:bionic-train flat-network-providers: physnet1 neutron-security-groups: true - channel: candidate keystone: charm: cs:~openstack-charmers/keystone num_units: 1 options: openstack-origin: cloud:bionic-train - channel: candidate neutron-gateway: charm: cs:~openstack-charmers/neutron-gateway num_units: 1 options: openstack-origin: cloud:bionic-train bridge-mappings: physnet1:br-ex - channel: candidate glance: charm: cs:~openstack-charmers/glance num_units: 1 options: openstack-origin: cloud:bionic-train - channel: candidate neutron-openvswitch: charm: cs:~openstack-charmers/neutron-openvswitch - channel: candidate placement: charm: cs:~openstack-charmers/placement num_units: 1 options: openstack-origin: cloud:bionic-train - channel: candidate nova-compute: charm: cs:~openstack-charmers/nova-compute num_units: 2 @@ -117,4 +109,3 @@ applications: ephemeral-device: /dev/vdb ephemeral-unmount: /mnt debug: true - channel: candidate diff --git a/tests/bundles/bionic-ussuri.yaml b/tests/bundles/bionic-ussuri.yaml index 4a839a56..08f35655 100644 --- a/tests/bundles/bionic-ussuri.yaml +++ b/tests/bundles/bionic-ussuri.yaml @@ -48,7 +48,6 @@ applications: rabbitmq-server: charm: cs:~openstack-charmers/rabbitmq-server num_units: 1 - channel: candidate percona-cluster: charm: cs:~openstack-charmers/percona-cluster num_units: 1 @@ -58,7 +57,6 @@ applications: dataset-size: 25% root-password: ChangeMe123 sst-password: ChangeMe123 - channel: candidate nova-cloud-controller: charm: ../../../nova-cloud-controller num_units: 1 @@ -78,35 +76,29 @@ applications: openstack-origin: cloud:bionic-ussuri flat-network-providers: physnet1 neutron-security-groups: true - channel: candidate keystone: charm: cs:~openstack-charmers/keystone num_units: 1 options: openstack-origin: cloud:bionic-ussuri - channel: candidate neutron-gateway: charm: cs:~openstack-charmers/neutron-gateway num_units: 1 options: openstack-origin: cloud:bionic-ussuri bridge-mappings: physnet1:br-ex - channel: candidate glance: charm: cs:~openstack-charmers/glance num_units: 1 options: openstack-origin: cloud:bionic-ussuri - channel: candidate neutron-openvswitch: charm: cs:~openstack-charmers/neutron-openvswitch - channel: candidate placement: charm: cs:~openstack-charmers/placement num_units: 1 options: openstack-origin: cloud:bionic-ussuri - channel: candidate nova-compute: charm: cs:~openstack-charmers/nova-compute num_units: 2 @@ -119,4 +111,3 @@ applications: ephemeral-device: /dev/vdb ephemeral-unmount: /mnt debug: true - channel: candidate diff --git a/tests/bundles/focal-ussuri.yaml b/tests/bundles/focal-ussuri.yaml index bfbbfef7..854a6a4a 100644 --- a/tests/bundles/focal-ussuri.yaml +++ b/tests/bundles/focal-ussuri.yaml @@ -31,22 +31,16 @@ applications: nova-cloud-controller-mysql-router: charm: cs:~openstack-charmers/mysql-router - channel: candidate keystone-mysql-router: charm: cs:~openstack-charmers/mysql-router - channel: candidate glance-mysql-router: charm: cs:~openstack-charmers/mysql-router - channel: candidate neutron-api-mysql-router: charm: cs:~openstack-charmers/mysql-router - channel: candidate placement-mysql-router: charm: cs:~openstack-charmers/mysql-router - channel: candidate vault-mysql-router: charm: cs:~openstack-charmers/mysql-router - channel: candidate mysql-innodb-cluster: charm: cs:~openstack-charmers/mysql-innodb-cluster @@ -59,14 +53,12 @@ applications: - '0' - '1' - '2' - channel: candidate rabbitmq-server: charm: cs:~openstack-charmers/rabbitmq-server num_units: 1 to: - '3' - channel: candidate nova-cloud-controller: charm: ../../../nova-cloud-controller @@ -92,7 +84,6 @@ applications: neutron-security-groups: true to: - '5' - channel: candidate keystone: charm: cs:~openstack-charmers/keystone @@ -101,7 +92,6 @@ applications: openstack-origin: *openstack-origin to: - '6' - channel: candidate neutron-gateway: charm: cs:~openstack-charmers/neutron-gateway @@ -111,7 +101,6 @@ applications: bridge-mappings: physnet1:br-ex to: - '7' - channel: candidate glance: charm: cs:~openstack-charmers/glance @@ -120,11 +109,9 @@ applications: openstack-origin: *openstack-origin to: - '8' - channel: candidate neutron-openvswitch: charm: cs:~openstack-charmers/neutron-openvswitch - channel: candidate placement: charm: cs:~openstack-charmers/placement @@ -133,7 +120,6 @@ applications: openstack-origin: *openstack-origin to: - '9' - channel: candidate nova-compute: charm: cs:~openstack-charmers/nova-compute @@ -149,14 +135,12 @@ applications: to: - '10' - '11' - channel: candidate vault: charm: cs:~openstack-charmers/vault num_units: 1 to: - '12' - channel: candidate relations: diff --git a/tests/bundles/focal-victoria.yaml b/tests/bundles/focal-victoria.yaml index fa734f55..a18339f1 100644 --- a/tests/bundles/focal-victoria.yaml +++ b/tests/bundles/focal-victoria.yaml @@ -31,22 +31,16 @@ applications: nova-cloud-controller-mysql-router: charm: cs:~openstack-charmers/mysql-router - channel: candidate keystone-mysql-router: charm: cs:~openstack-charmers/mysql-router - channel: candidate glance-mysql-router: charm: cs:~openstack-charmers/mysql-router - channel: candidate neutron-api-mysql-router: charm: cs:~openstack-charmers/mysql-router - channel: candidate placement-mysql-router: charm: cs:~openstack-charmers/mysql-router - channel: candidate vault-mysql-router: charm: cs:~openstack-charmers/mysql-router - channel: candidate mysql-innodb-cluster: charm: cs:~openstack-charmers/mysql-innodb-cluster @@ -59,14 +53,12 @@ applications: - '0' - '1' - '2' - channel: candidate rabbitmq-server: charm: cs:~openstack-charmers/rabbitmq-server num_units: 1 to: - '3' - channel: candidate nova-cloud-controller: charm: ../../../nova-cloud-controller @@ -92,7 +84,6 @@ applications: neutron-security-groups: true to: - '5' - channel: candidate keystone: charm: cs:~openstack-charmers/keystone @@ -101,7 +92,6 @@ applications: openstack-origin: *openstack-origin to: - '6' - channel: candidate neutron-gateway: charm: cs:~openstack-charmers/neutron-gateway @@ -111,7 +101,6 @@ applications: bridge-mappings: physnet1:br-ex to: - '7' - channel: candidate glance: charm: cs:~openstack-charmers/glance @@ -120,11 +109,9 @@ applications: openstack-origin: *openstack-origin to: - '8' - channel: candidate neutron-openvswitch: charm: cs:~openstack-charmers/neutron-openvswitch - channel: candidate placement: charm: cs:~openstack-charmers/placement @@ -133,7 +120,6 @@ applications: openstack-origin: *openstack-origin to: - '9' - channel: candidate nova-compute: charm: cs:~openstack-charmers/nova-compute @@ -149,14 +135,12 @@ applications: to: - '10' - '11' - channel: candidate vault: charm: cs:~openstack-charmers/vault num_units: 1 to: - '12' - channel: candidate relations: diff --git a/tests/bundles/focal-wallaby.yaml b/tests/bundles/focal-wallaby.yaml index a55411ab..30fcaeb4 100644 --- a/tests/bundles/focal-wallaby.yaml +++ b/tests/bundles/focal-wallaby.yaml @@ -31,22 +31,16 @@ applications: nova-cloud-controller-mysql-router: charm: cs:~openstack-charmers/mysql-router - channel: candidate keystone-mysql-router: charm: cs:~openstack-charmers/mysql-router - channel: candidate glance-mysql-router: charm: cs:~openstack-charmers/mysql-router - channel: candidate neutron-api-mysql-router: charm: cs:~openstack-charmers/mysql-router - channel: candidate placement-mysql-router: charm: cs:~openstack-charmers/mysql-router - channel: candidate vault-mysql-router: charm: cs:~openstack-charmers/mysql-router - channel: candidate mysql-innodb-cluster: charm: cs:~openstack-charmers/mysql-innodb-cluster @@ -59,14 +53,12 @@ applications: - '0' - '1' - '2' - channel: candidate rabbitmq-server: charm: cs:~openstack-charmers/rabbitmq-server num_units: 1 to: - '3' - channel: candidate nova-cloud-controller: charm: ../../../nova-cloud-controller @@ -92,7 +84,6 @@ applications: neutron-security-groups: true to: - '5' - channel: candidate keystone: charm: cs:~openstack-charmers/keystone @@ -101,7 +92,6 @@ applications: openstack-origin: *openstack-origin to: - '6' - channel: candidate neutron-gateway: charm: cs:~openstack-charmers/neutron-gateway @@ -111,7 +101,6 @@ applications: bridge-mappings: physnet1:br-ex to: - '7' - channel: candidate glance: charm: cs:~openstack-charmers/glance @@ -120,11 +109,9 @@ applications: openstack-origin: *openstack-origin to: - '8' - channel: candidate neutron-openvswitch: charm: cs:~openstack-charmers/neutron-openvswitch - channel: candidate placement: charm: cs:~openstack-charmers/placement @@ -133,7 +120,6 @@ applications: openstack-origin: *openstack-origin to: - '9' - channel: candidate nova-compute: charm: cs:~openstack-charmers/nova-compute @@ -149,14 +135,12 @@ applications: to: - '10' - '11' - channel: candidate vault: charm: cs:~openstack-charmers/vault num_units: 1 to: - '12' - channel: candidate relations: diff --git a/tests/bundles/focal-xena.yaml b/tests/bundles/focal-xena.yaml index 6f4878af..14682a74 100644 --- a/tests/bundles/focal-xena.yaml +++ b/tests/bundles/focal-xena.yaml @@ -31,22 +31,16 @@ applications: nova-cloud-controller-mysql-router: charm: cs:~openstack-charmers/mysql-router - channel: candidate keystone-mysql-router: charm: cs:~openstack-charmers/mysql-router - channel: candidate glance-mysql-router: charm: cs:~openstack-charmers/mysql-router - channel: candidate neutron-api-mysql-router: charm: cs:~openstack-charmers/mysql-router - channel: candidate placement-mysql-router: charm: cs:~openstack-charmers/mysql-router - channel: candidate vault-mysql-router: charm: cs:~openstack-charmers/mysql-router - channel: candidate mysql-innodb-cluster: charm: cs:~openstack-charmers/mysql-innodb-cluster @@ -59,14 +53,12 @@ applications: - '0' - '1' - '2' - channel: candidate rabbitmq-server: charm: cs:~openstack-charmers/rabbitmq-server num_units: 1 to: - '3' - channel: candidate nova-cloud-controller: charm: ../../../nova-cloud-controller @@ -92,7 +84,6 @@ applications: neutron-security-groups: true to: - '5' - channel: candidate keystone: charm: cs:~openstack-charmers/keystone @@ -101,7 +92,6 @@ applications: openstack-origin: *openstack-origin to: - '6' - channel: candidate neutron-gateway: charm: cs:~openstack-charmers/neutron-gateway @@ -111,7 +101,6 @@ applications: bridge-mappings: physnet1:br-ex to: - '7' - channel: candidate glance: charm: cs:~openstack-charmers/glance @@ -120,11 +109,9 @@ applications: openstack-origin: *openstack-origin to: - '8' - channel: candidate neutron-openvswitch: charm: cs:~openstack-charmers/neutron-openvswitch - channel: candidate placement: charm: cs:~openstack-charmers/placement @@ -133,7 +120,6 @@ applications: openstack-origin: *openstack-origin to: - '9' - channel: candidate nova-compute: charm: cs:~openstack-charmers/nova-compute @@ -149,14 +135,12 @@ applications: to: - '10' - '11' - channel: candidate vault: charm: cs:~openstack-charmers/vault num_units: 1 to: - '12' - channel: candidate relations: diff --git a/tests/bundles/groovy-victoria.yaml b/tests/bundles/groovy-victoria.yaml index 82eb28b3..10208f14 100644 --- a/tests/bundles/groovy-victoria.yaml +++ b/tests/bundles/groovy-victoria.yaml @@ -31,22 +31,16 @@ applications: nova-cloud-controller-mysql-router: charm: cs:~openstack-charmers/mysql-router - channel: candidate keystone-mysql-router: charm: cs:~openstack-charmers/mysql-router - channel: candidate glance-mysql-router: charm: cs:~openstack-charmers/mysql-router - channel: candidate neutron-api-mysql-router: charm: cs:~openstack-charmers/mysql-router - channel: candidate placement-mysql-router: charm: cs:~openstack-charmers/mysql-router - channel: candidate vault-mysql-router: charm: cs:~openstack-charmers/mysql-router - channel: candidate mysql-innodb-cluster: charm: cs:~openstack-charmers/mysql-innodb-cluster @@ -59,14 +53,12 @@ applications: - '0' - '1' - '2' - channel: candidate rabbitmq-server: charm: cs:~openstack-charmers/rabbitmq-server num_units: 1 to: - '3' - channel: candidate nova-cloud-controller: charm: ../../../nova-cloud-controller @@ -92,7 +84,6 @@ applications: neutron-security-groups: true to: - '5' - channel: candidate keystone: charm: cs:~openstack-charmers/keystone @@ -101,7 +92,6 @@ applications: openstack-origin: *openstack-origin to: - '6' - channel: candidate neutron-gateway: charm: cs:~openstack-charmers/neutron-gateway @@ -111,7 +101,6 @@ applications: bridge-mappings: physnet1:br-ex to: - '7' - channel: candidate glance: charm: cs:~openstack-charmers/glance @@ -120,11 +109,9 @@ applications: openstack-origin: *openstack-origin to: - '8' - channel: candidate neutron-openvswitch: charm: cs:~openstack-charmers/neutron-openvswitch - channel: candidate placement: charm: cs:~openstack-charmers/placement @@ -133,7 +120,6 @@ applications: openstack-origin: *openstack-origin to: - '9' - channel: candidate nova-compute: charm: cs:~openstack-charmers/nova-compute @@ -149,14 +135,12 @@ applications: to: - '10' - '11' - channel: candidate vault: charm: cs:~openstack-charmers/vault num_units: 1 to: - '12' - channel: candidate relations: diff --git a/tests/bundles/hirsute-wallaby.yaml b/tests/bundles/hirsute-wallaby.yaml index c8a04a9a..e5137e50 100644 --- a/tests/bundles/hirsute-wallaby.yaml +++ b/tests/bundles/hirsute-wallaby.yaml @@ -31,22 +31,16 @@ applications: nova-cloud-controller-mysql-router: charm: cs:~openstack-charmers/mysql-router - channel: candidate keystone-mysql-router: charm: cs:~openstack-charmers/mysql-router - channel: candidate glance-mysql-router: charm: cs:~openstack-charmers/mysql-router - channel: candidate neutron-api-mysql-router: charm: cs:~openstack-charmers/mysql-router - channel: candidate placement-mysql-router: charm: cs:~openstack-charmers/mysql-router - channel: candidate vault-mysql-router: charm: cs:~openstack-charmers/mysql-router - channel: candidate mysql-innodb-cluster: charm: cs:~openstack-charmers/mysql-innodb-cluster @@ -59,14 +53,12 @@ applications: - '0' - '1' - '2' - channel: candidate rabbitmq-server: charm: cs:~openstack-charmers/rabbitmq-server num_units: 1 to: - '3' - channel: candidate nova-cloud-controller: charm: ../../../nova-cloud-controller @@ -92,7 +84,6 @@ applications: neutron-security-groups: true to: - '5' - channel: candidate keystone: charm: cs:~openstack-charmers/keystone @@ -101,7 +92,6 @@ applications: openstack-origin: *openstack-origin to: - '6' - channel: candidate neutron-gateway: charm: cs:~openstack-charmers/neutron-gateway @@ -111,7 +101,6 @@ applications: bridge-mappings: physnet1:br-ex to: - '7' - channel: candidate glance: charm: cs:~openstack-charmers/glance @@ -120,11 +109,9 @@ applications: openstack-origin: *openstack-origin to: - '8' - channel: candidate neutron-openvswitch: charm: cs:~openstack-charmers/neutron-openvswitch - channel: candidate placement: charm: cs:~openstack-charmers/placement @@ -133,7 +120,6 @@ applications: openstack-origin: *openstack-origin to: - '9' - channel: candidate nova-compute: charm: cs:~openstack-charmers/nova-compute @@ -149,14 +135,12 @@ applications: to: - '10' - '11' - channel: candidate vault: charm: cs:~openstack-charmers/vault num_units: 1 to: - '12' - channel: candidate relations: diff --git a/tests/bundles/impish-xena.yaml b/tests/bundles/impish-xena.yaml index 85b1d4e2..6869b271 100644 --- a/tests/bundles/impish-xena.yaml +++ b/tests/bundles/impish-xena.yaml @@ -31,22 +31,16 @@ applications: nova-cloud-controller-mysql-router: charm: cs:~openstack-charmers/mysql-router - channel: candidate keystone-mysql-router: charm: cs:~openstack-charmers/mysql-router - channel: candidate glance-mysql-router: charm: cs:~openstack-charmers/mysql-router - channel: candidate neutron-api-mysql-router: charm: cs:~openstack-charmers/mysql-router - channel: candidate placement-mysql-router: charm: cs:~openstack-charmers/mysql-router - channel: candidate vault-mysql-router: charm: cs:~openstack-charmers/mysql-router - channel: candidate mysql-innodb-cluster: charm: cs:~openstack-charmers/mysql-innodb-cluster @@ -59,14 +53,12 @@ applications: - '0' - '1' - '2' - channel: candidate rabbitmq-server: charm: cs:~openstack-charmers/rabbitmq-server num_units: 1 to: - '3' - channel: candidate nova-cloud-controller: charm: ../../../nova-cloud-controller @@ -92,7 +84,6 @@ applications: neutron-security-groups: true to: - '5' - channel: candidate keystone: charm: cs:~openstack-charmers/keystone @@ -101,7 +92,6 @@ applications: openstack-origin: *openstack-origin to: - '6' - channel: candidate neutron-gateway: charm: cs:~openstack-charmers/neutron-gateway @@ -111,7 +101,6 @@ applications: bridge-mappings: physnet1:br-ex to: - '7' - channel: candidate glance: charm: cs:~openstack-charmers/glance @@ -120,11 +109,9 @@ applications: openstack-origin: *openstack-origin to: - '8' - channel: candidate neutron-openvswitch: charm: cs:~openstack-charmers/neutron-openvswitch - channel: candidate placement: charm: cs:~openstack-charmers/placement @@ -133,7 +120,6 @@ applications: openstack-origin: *openstack-origin to: - '9' - channel: candidate nova-compute: charm: cs:~openstack-charmers/nova-compute @@ -149,14 +135,12 @@ applications: to: - '10' - '11' - channel: candidate vault: charm: cs:~openstack-charmers/vault num_units: 1 to: - '12' - channel: candidate relations: diff --git a/tests/bundles/xenial-mitaka.yaml b/tests/bundles/xenial-mitaka.yaml index 7366db29..8e32bb19 100644 --- a/tests/bundles/xenial-mitaka.yaml +++ b/tests/bundles/xenial-mitaka.yaml @@ -42,7 +42,6 @@ applications: rabbitmq-server: charm: cs:~openstack-charmers/rabbitmq-server num_units: 1 - channel: candidate percona-cluster: charm: cs:~openstack-charmers/percona-cluster num_units: 1 @@ -52,7 +51,6 @@ applications: dataset-size: 25% root-password: ChangeMe123 sst-password: ChangeMe123 - channel: candidate nova-cloud-controller: charm: ../../../nova-cloud-controller num_units: 1 @@ -66,24 +64,19 @@ applications: options: flat-network-providers: physnet1 neutron-security-groups: true - channel: candidate keystone: charm: cs:~openstack-charmers/keystone num_units: 1 - channel: candidate neutron-gateway: charm: cs:~openstack-charmers/neutron-gateway num_units: 1 options: bridge-mappings: physnet1:br-ex - channel: candidate glance: charm: cs:~openstack-charmers/glance num_units: 1 - channel: candidate neutron-openvswitch: charm: cs:~openstack-charmers/neutron-openvswitch - channel: candidate nova-compute: charm: cs:~openstack-charmers/nova-compute num_units: 2 @@ -95,4 +88,3 @@ applications: ephemeral-device: /dev/vdb ephemeral-unmount: /mnt debug: true - channel: candidate diff --git a/tests/bundles/xenial-ocata.yaml b/tests/bundles/xenial-ocata.yaml index 3b156689..7ecad271 100644 --- a/tests/bundles/xenial-ocata.yaml +++ b/tests/bundles/xenial-ocata.yaml @@ -42,7 +42,6 @@ applications: rabbitmq-server: charm: cs:~openstack-charmers/rabbitmq-server num_units: 1 - channel: candidate percona-cluster: charm: cs:~openstack-charmers/percona-cluster num_units: 1 @@ -52,7 +51,6 @@ applications: dataset-size: 25% root-password: ChangeMe123 sst-password: ChangeMe123 - channel: candidate nova-cloud-controller: charm: ../../../nova-cloud-controller num_units: 1 @@ -70,29 +68,24 @@ applications: openstack-origin: cloud:xenial-ocata flat-network-providers: physnet1 neutron-security-groups: true - channel: candidate keystone: charm: cs:~openstack-charmers/keystone num_units: 1 options: openstack-origin: cloud:xenial-ocata - channel: candidate neutron-gateway: charm: cs:~openstack-charmers/neutron-gateway num_units: 1 options: openstack-origin: cloud:xenial-ocata bridge-mappings: physnet1:br-ex - channel: candidate glance: charm: cs:~openstack-charmers/glance num_units: 1 options: openstack-origin: cloud:xenial-ocata - channel: candidate neutron-openvswitch: charm: cs:~openstack-charmers/neutron-openvswitch - channel: candidate nova-compute: charm: cs:~openstack-charmers/nova-compute num_units: 2 @@ -105,4 +98,3 @@ applications: ephemeral-device: /dev/vdb ephemeral-unmount: /mnt debug: true - channel: candidate diff --git a/tests/bundles/xenial-pike.yaml b/tests/bundles/xenial-pike.yaml index dab046b3..c2b3c109 100644 --- a/tests/bundles/xenial-pike.yaml +++ b/tests/bundles/xenial-pike.yaml @@ -42,7 +42,6 @@ applications: rabbitmq-server: charm: cs:~openstack-charmers/rabbitmq-server num_units: 1 - channel: candidate percona-cluster: charm: cs:~openstack-charmers/percona-cluster num_units: 1 @@ -52,7 +51,6 @@ applications: dataset-size: 25% root-password: ChangeMe123 sst-password: ChangeMe123 - channel: candidate nova-cloud-controller: charm: ../../../nova-cloud-controller num_units: 1 @@ -70,29 +68,24 @@ applications: openstack-origin: cloud:xenial-pike flat-network-providers: physnet1 neutron-security-groups: true - channel: candidate keystone: charm: cs:~openstack-charmers/keystone num_units: 1 options: openstack-origin: cloud:xenial-pike - channel: candidate neutron-gateway: charm: cs:~openstack-charmers/neutron-gateway num_units: 1 options: openstack-origin: cloud:xenial-pike bridge-mappings: physnet1:br-ex - channel: candidate glance: charm: cs:~openstack-charmers/glance num_units: 1 options: openstack-origin: cloud:xenial-pike - channel: candidate neutron-openvswitch: charm: cs:~openstack-charmers/neutron-openvswitch - channel: candidate nova-compute: charm: cs:~openstack-charmers/nova-compute num_units: 2 @@ -105,4 +98,3 @@ applications: ephemeral-device: /dev/vdb ephemeral-unmount: /mnt debug: true - channel: candidate diff --git a/tests/bundles/xenial-queens.yaml b/tests/bundles/xenial-queens.yaml index 0822218b..7881a701 100644 --- a/tests/bundles/xenial-queens.yaml +++ b/tests/bundles/xenial-queens.yaml @@ -42,7 +42,6 @@ applications: rabbitmq-server: charm: cs:~openstack-charmers/rabbitmq-server num_units: 1 - channel: candidate percona-cluster: charm: cs:~openstack-charmers/percona-cluster num_units: 1 @@ -52,7 +51,6 @@ applications: dataset-size: 25% root-password: ChangeMe123 sst-password: ChangeMe123 - channel: candidate nova-cloud-controller: charm: ../../../nova-cloud-controller num_units: 1 @@ -70,29 +68,24 @@ applications: openstack-origin: cloud:xenial-queens flat-network-providers: physnet1 neutron-security-groups: true - channel: candidate keystone: charm: cs:~openstack-charmers/keystone num_units: 1 options: openstack-origin: cloud:xenial-queens - channel: candidate neutron-gateway: charm: cs:~openstack-charmers/neutron-gateway num_units: 1 options: openstack-origin: cloud:xenial-queens bridge-mappings: physnet1:br-ex - channel: candidate glance: charm: cs:~openstack-charmers/glance num_units: 1 options: openstack-origin: cloud:xenial-queens - channel: candidate neutron-openvswitch: charm: cs:~openstack-charmers/neutron-openvswitch - channel: candidate nova-compute: charm: cs:~openstack-charmers/nova-compute num_units: 2 @@ -105,4 +98,3 @@ applications: ephemeral-device: /dev/vdb ephemeral-unmount: /mnt debug: true - channel: candidate