diff --git a/tests/bundles/bionic-queens-multisite.yaml b/tests/bundles/bionic-queens-multisite.yaml index aff3544d..ec54635e 100644 --- a/tests/bundles/bionic-queens-multisite.yaml +++ b/tests/bundles/bionic-queens-multisite.yaml @@ -20,13 +20,11 @@ applications: osd-devices: 'cinder,10G' options: source: *source - channel: candidate east-ceph-mon: charm: cs:~openstack-charmers/ceph-mon num_units: 3 options: source: *source - channel: candidate slave-ceph-radosgw: series: bionic charm: ../../../ceph-radosgw @@ -45,17 +43,14 @@ applications: osd-devices: 'cinder,10G' options: source: *source - channel: candidate west-ceph-mon: charm: cs:~openstack-charmers/ceph-mon num_units: 3 options: source: *source - channel: candidate percona-cluster: charm: cs:~openstack-charmers/percona-cluster num_units: 1 - channel: candidate keystone: expose: True charm: cs:~openstack-charmers/keystone @@ -63,7 +58,6 @@ applications: options: openstack-origin: *source region: "east-1 west-1" - channel: candidate relations: - - keystone:shared-db - percona-cluster:shared-db diff --git a/tests/bundles/bionic-queens-namespaced.yaml b/tests/bundles/bionic-queens-namespaced.yaml index 9d88bbe1..af6f90fb 100644 --- a/tests/bundles/bionic-queens-namespaced.yaml +++ b/tests/bundles/bionic-queens-namespaced.yaml @@ -18,28 +18,23 @@ applications: options: source: *source osd-devices: '/srv/ceph /dev/test-non-existent' - channel: candidate ceph-mon: charm: cs:~openstack-charmers/ceph-mon num_units: 3 options: source: *source - channel: candidate percona-cluster: charm: cs:~openstack-charmers/percona-cluster num_units: 1 - channel: candidate keystone: expose: True charm: cs:~openstack-charmers/keystone num_units: 1 options: openstack-origin: *source - channel: candidate vault: charm: cs:~openstack-charmers/vault num_units: 1 - channel: candidate relations: - - keystone:shared-db - percona-cluster:shared-db diff --git a/tests/bundles/bionic-queens.yaml b/tests/bundles/bionic-queens.yaml index 5fba3c73..a84949b2 100644 --- a/tests/bundles/bionic-queens.yaml +++ b/tests/bundles/bionic-queens.yaml @@ -17,28 +17,23 @@ applications: options: source: *source osd-devices: '/srv/ceph /dev/test-non-existent' - channel: candidate ceph-mon: charm: cs:~openstack-charmers/ceph-mon num_units: 3 options: source: *source - channel: candidate percona-cluster: charm: cs:~openstack-charmers/percona-cluster num_units: 1 - channel: candidate keystone: expose: True charm: cs:~openstack-charmers/keystone num_units: 1 options: openstack-origin: *source - channel: candidate vault: charm: cs:~openstack-charmers/vault num_units: 1 - channel: candidate relations: - - keystone:shared-db - percona-cluster:shared-db diff --git a/tests/bundles/bionic-rocky-multisite.yaml b/tests/bundles/bionic-rocky-multisite.yaml index 4a03ba4c..6ff47cc6 100644 --- a/tests/bundles/bionic-rocky-multisite.yaml +++ b/tests/bundles/bionic-rocky-multisite.yaml @@ -20,13 +20,11 @@ applications: osd-devices: 'cinder,10G' options: source: *source - channel: candidate east-ceph-mon: charm: cs:~openstack-charmers/ceph-mon num_units: 3 options: source: *source - channel: candidate slave-ceph-radosgw: series: bionic charm: ../../../ceph-radosgw @@ -45,17 +43,14 @@ applications: osd-devices: 'cinder,10G' options: source: *source - channel: candidate west-ceph-mon: charm: cs:~openstack-charmers/ceph-mon num_units: 3 options: source: *source - channel: candidate percona-cluster: charm: cs:~openstack-charmers/percona-cluster num_units: 1 - channel: candidate keystone: expose: True charm: cs:~openstack-charmers/keystone @@ -63,7 +58,6 @@ applications: options: openstack-origin: *source region: "east-1 west-1" - channel: candidate relations: - - keystone:shared-db - percona-cluster:shared-db diff --git a/tests/bundles/bionic-rocky-namespaced.yaml b/tests/bundles/bionic-rocky-namespaced.yaml index 52b7436f..b11f22b8 100644 --- a/tests/bundles/bionic-rocky-namespaced.yaml +++ b/tests/bundles/bionic-rocky-namespaced.yaml @@ -18,28 +18,23 @@ applications: options: source: *source osd-devices: '/srv/ceph /dev/test-non-existent' - channel: candidate ceph-mon: charm: cs:~openstack-charmers/ceph-mon num_units: 3 options: source: *source - channel: candidate percona-cluster: charm: cs:~openstack-charmers/percona-cluster num_units: 1 - channel: candidate keystone: expose: True charm: cs:~openstack-charmers/keystone num_units: 1 options: openstack-origin: *source - channel: candidate vault: charm: cs:~openstack-charmers/vault num_units: 1 - channel: candidate relations: - - keystone:shared-db - percona-cluster:shared-db diff --git a/tests/bundles/bionic-rocky.yaml b/tests/bundles/bionic-rocky.yaml index 59bd9aa5..ca7e61c9 100644 --- a/tests/bundles/bionic-rocky.yaml +++ b/tests/bundles/bionic-rocky.yaml @@ -17,28 +17,23 @@ applications: options: source: *source osd-devices: '/srv/ceph /dev/test-non-existent' - channel: candidate ceph-mon: charm: cs:~openstack-charmers/ceph-mon num_units: 3 options: source: *source - channel: candidate percona-cluster: charm: cs:~openstack-charmers/percona-cluster num_units: 1 - channel: candidate keystone: expose: True charm: cs:~openstack-charmers/keystone num_units: 1 options: openstack-origin: *source - channel: candidate vault: charm: cs:~openstack-charmers/vault num_units: 1 - channel: candidate relations: - - keystone:shared-db - percona-cluster:shared-db diff --git a/tests/bundles/bionic-stein-namespaced.yaml b/tests/bundles/bionic-stein-namespaced.yaml index 17c794c9..874c2609 100644 --- a/tests/bundles/bionic-stein-namespaced.yaml +++ b/tests/bundles/bionic-stein-namespaced.yaml @@ -18,28 +18,23 @@ applications: options: source: *source osd-devices: '/srv/ceph /dev/test-non-existent' - channel: candidate ceph-mon: charm: cs:~openstack-charmers/ceph-mon num_units: 3 options: source: *source - channel: candidate percona-cluster: charm: cs:~openstack-charmers/percona-cluster num_units: 1 - channel: candidate keystone: expose: True charm: cs:~openstack-charmers/keystone num_units: 1 options: openstack-origin: *source - channel: candidate vault: charm: cs:~openstack-charmers/vault num_units: 1 - channel: candidate relations: - - keystone:shared-db - percona-cluster:shared-db diff --git a/tests/bundles/bionic-stein.yaml b/tests/bundles/bionic-stein.yaml index d949361a..3617911d 100644 --- a/tests/bundles/bionic-stein.yaml +++ b/tests/bundles/bionic-stein.yaml @@ -17,28 +17,23 @@ applications: options: source: *source osd-devices: '/srv/ceph /dev/test-non-existent' - channel: candidate ceph-mon: charm: cs:~openstack-charmers/ceph-mon num_units: 3 options: source: *source - channel: candidate percona-cluster: charm: cs:~openstack-charmers/percona-cluster num_units: 1 - channel: candidate keystone: expose: True charm: cs:~openstack-charmers/keystone num_units: 1 options: openstack-origin: *source - channel: candidate vault: charm: cs:~openstack-charmers/vault num_units: 1 - channel: candidate relations: - - keystone:shared-db - percona-cluster:shared-db diff --git a/tests/bundles/bionic-train-namespaced.yaml b/tests/bundles/bionic-train-namespaced.yaml index acdcc4db..4b192162 100644 --- a/tests/bundles/bionic-train-namespaced.yaml +++ b/tests/bundles/bionic-train-namespaced.yaml @@ -18,28 +18,23 @@ applications: options: source: *source osd-devices: '/srv/ceph /dev/test-non-existent' - channel: candidate ceph-mon: charm: cs:~openstack-charmers/ceph-mon num_units: 3 options: source: *source - channel: candidate percona-cluster: charm: cs:~openstack-charmers/percona-cluster num_units: 1 - channel: candidate keystone: expose: True charm: cs:~openstack-charmers/keystone num_units: 1 options: openstack-origin: *source - channel: candidate vault: charm: cs:~openstack-charmers/vault num_units: 1 - channel: candidate relations: - - keystone:shared-db - percona-cluster:shared-db diff --git a/tests/bundles/bionic-train.yaml b/tests/bundles/bionic-train.yaml index 16bff283..8108a195 100644 --- a/tests/bundles/bionic-train.yaml +++ b/tests/bundles/bionic-train.yaml @@ -17,28 +17,23 @@ applications: options: source: *source osd-devices: '/srv/ceph /dev/test-non-existent' - channel: candidate ceph-mon: charm: cs:~openstack-charmers/ceph-mon num_units: 3 options: source: *source - channel: candidate percona-cluster: charm: cs:~openstack-charmers/percona-cluster num_units: 1 - channel: candidate keystone: expose: True charm: cs:~openstack-charmers/keystone num_units: 1 options: openstack-origin: *source - channel: candidate vault: charm: cs:~openstack-charmers/vault num_units: 1 - channel: candidate relations: - - keystone:shared-db - percona-cluster:shared-db diff --git a/tests/bundles/bionic-ussuri-namespaced.yaml b/tests/bundles/bionic-ussuri-namespaced.yaml index f5a38f66..1f91a972 100644 --- a/tests/bundles/bionic-ussuri-namespaced.yaml +++ b/tests/bundles/bionic-ussuri-namespaced.yaml @@ -18,28 +18,23 @@ applications: options: source: *source osd-devices: '/srv/ceph /dev/test-non-existent' - channel: candidate ceph-mon: charm: cs:~openstack-charmers/ceph-mon num_units: 3 options: source: *source - channel: candidate percona-cluster: charm: cs:~openstack-charmers/percona-cluster num_units: 1 - channel: candidate keystone: expose: True charm: cs:~openstack-charmers/keystone num_units: 1 options: openstack-origin: *source - channel: candidate vault: charm: cs:~openstack-charmers/vault num_units: 1 - channel: candidate relations: - - keystone:shared-db - percona-cluster:shared-db diff --git a/tests/bundles/bionic-ussuri.yaml b/tests/bundles/bionic-ussuri.yaml index 860a0946..d9a6d0f9 100644 --- a/tests/bundles/bionic-ussuri.yaml +++ b/tests/bundles/bionic-ussuri.yaml @@ -17,28 +17,23 @@ applications: options: source: *source osd-devices: '/srv/ceph /dev/test-non-existent' - channel: candidate ceph-mon: charm: cs:~openstack-charmers/ceph-mon num_units: 3 options: source: *source - channel: candidate percona-cluster: charm: cs:~openstack-charmers/percona-cluster num_units: 1 - channel: candidate keystone: expose: True charm: cs:~openstack-charmers/keystone num_units: 1 options: openstack-origin: *source - channel: candidate vault: charm: cs:~openstack-charmers/vault num_units: 1 - channel: candidate relations: - - keystone:shared-db - percona-cluster:shared-db diff --git a/tests/bundles/focal-ussuri-ec.yaml b/tests/bundles/focal-ussuri-ec.yaml index 3580bd36..00bd6d2a 100644 --- a/tests/bundles/focal-ussuri-ec.yaml +++ b/tests/bundles/focal-ussuri-ec.yaml @@ -29,7 +29,6 @@ applications: keystone-mysql-router: charm: cs:~openstack-charmers/mysql-router - channel: candidate mysql-innodb-cluster: charm: cs:~openstack-charmers/mysql-innodb-cluster @@ -40,7 +39,6 @@ applications: - '0' - '1' - '2' - channel: candidate ceph-radosgw: charm: ceph-radosgw @@ -69,7 +67,6 @@ applications: - '12' - '13' - '14' - channel: candidate ceph-mon: charm: cs:~openstack-charmers/ceph-mon @@ -80,7 +77,6 @@ applications: - '7' - '8' - '9' - channel: candidate keystone: expose: True @@ -90,18 +86,15 @@ applications: openstack-origin: *source to: - '10' - channel: candidate vault-mysql-router: charm: cs:~openstack-charmers/mysql-router - channel: candidate vault: charm: cs:~openstack-charmers/vault num_units: 1 to: - '11' - channel: candidate relations: diff --git a/tests/bundles/focal-ussuri-namespaced.yaml b/tests/bundles/focal-ussuri-namespaced.yaml index 6d16342f..1a6779f1 100644 --- a/tests/bundles/focal-ussuri-namespaced.yaml +++ b/tests/bundles/focal-ussuri-namespaced.yaml @@ -26,7 +26,6 @@ applications: keystone-mysql-router: charm: cs:~openstack-charmers/mysql-router - channel: candidate mysql-innodb-cluster: charm: cs:~openstack-charmers/mysql-innodb-cluster @@ -37,7 +36,6 @@ applications: - '0' - '1' - '2' - channel: candidate ceph-radosgw: charm: ceph-radosgw @@ -61,7 +59,6 @@ applications: - '4' - '5' - '6' - channel: candidate ceph-mon: charm: cs:~openstack-charmers/ceph-mon @@ -72,7 +69,6 @@ applications: - '7' - '8' - '9' - channel: candidate keystone: expose: True @@ -82,18 +78,15 @@ applications: openstack-origin: *source to: - '10' - channel: candidate vault-mysql-router: charm: cs:~openstack-charmers/mysql-router - channel: candidate vault: charm: cs:~openstack-charmers/vault num_units: 1 to: - '11' - channel: candidate relations: diff --git a/tests/bundles/focal-ussuri.yaml b/tests/bundles/focal-ussuri.yaml index 0f7564ea..8972315c 100644 --- a/tests/bundles/focal-ussuri.yaml +++ b/tests/bundles/focal-ussuri.yaml @@ -26,7 +26,6 @@ applications: keystone-mysql-router: charm: cs:~openstack-charmers/mysql-router - channel: candidate mysql-innodb-cluster: charm: cs:~openstack-charmers/mysql-innodb-cluster @@ -37,7 +36,6 @@ applications: - '0' - '1' - '2' - channel: candidate ceph-radosgw: charm: ceph-radosgw @@ -60,7 +58,6 @@ applications: - '4' - '5' - '6' - channel: candidate ceph-mon: charm: cs:~openstack-charmers/ceph-mon @@ -71,7 +68,6 @@ applications: - '7' - '8' - '9' - channel: candidate keystone: expose: True @@ -81,18 +77,15 @@ applications: openstack-origin: *source to: - '10' - channel: candidate vault-mysql-router: charm: cs:~openstack-charmers/mysql-router - channel: candidate vault: charm: cs:~openstack-charmers/vault num_units: 1 to: - '11' - channel: candidate relations: diff --git a/tests/bundles/focal-victoria-namespaced.yaml b/tests/bundles/focal-victoria-namespaced.yaml index 229a44fb..f880a686 100644 --- a/tests/bundles/focal-victoria-namespaced.yaml +++ b/tests/bundles/focal-victoria-namespaced.yaml @@ -26,7 +26,6 @@ applications: keystone-mysql-router: charm: cs:~openstack-charmers/mysql-router - channel: candidate mysql-innodb-cluster: charm: cs:~openstack-charmers/mysql-innodb-cluster @@ -37,7 +36,6 @@ applications: - '0' - '1' - '2' - channel: candidate ceph-radosgw: charm: ceph-radosgw @@ -61,7 +59,6 @@ applications: - '4' - '5' - '6' - channel: candidate ceph-mon: charm: cs:~openstack-charmers/ceph-mon @@ -72,7 +69,6 @@ applications: - '7' - '8' - '9' - channel: candidate keystone: expose: True @@ -82,18 +78,15 @@ applications: openstack-origin: *source to: - '10' - channel: candidate vault-mysql-router: charm: cs:~openstack-charmers/mysql-router - channel: candidate vault: charm: cs:~openstack-charmers/vault num_units: 1 to: - '11' - channel: candidate relations: diff --git a/tests/bundles/focal-victoria.yaml b/tests/bundles/focal-victoria.yaml index b2df1da0..da78b98b 100644 --- a/tests/bundles/focal-victoria.yaml +++ b/tests/bundles/focal-victoria.yaml @@ -26,7 +26,6 @@ applications: keystone-mysql-router: charm: cs:~openstack-charmers/mysql-router - channel: candidate mysql-innodb-cluster: charm: cs:~openstack-charmers/mysql-innodb-cluster @@ -37,7 +36,6 @@ applications: - '0' - '1' - '2' - channel: candidate ceph-radosgw: charm: ceph-radosgw @@ -60,7 +58,6 @@ applications: - '4' - '5' - '6' - channel: candidate ceph-mon: charm: cs:~openstack-charmers/ceph-mon @@ -71,7 +68,6 @@ applications: - '7' - '8' - '9' - channel: candidate keystone: expose: True @@ -81,18 +77,15 @@ applications: openstack-origin: *source to: - '10' - channel: candidate vault-mysql-router: charm: cs:~openstack-charmers/mysql-router - channel: candidate vault: charm: cs:~openstack-charmers/vault num_units: 1 to: - '11' - channel: candidate relations: diff --git a/tests/bundles/focal-wallaby-namespaced.yaml b/tests/bundles/focal-wallaby-namespaced.yaml index ee1fc451..843dc9b2 100644 --- a/tests/bundles/focal-wallaby-namespaced.yaml +++ b/tests/bundles/focal-wallaby-namespaced.yaml @@ -26,7 +26,6 @@ applications: keystone-mysql-router: charm: cs:~openstack-charmers/mysql-router - channel: candidate mysql-innodb-cluster: charm: cs:~openstack-charmers/mysql-innodb-cluster @@ -37,7 +36,6 @@ applications: - '0' - '1' - '2' - channel: candidate ceph-radosgw: charm: ceph-radosgw @@ -61,7 +59,6 @@ applications: - '4' - '5' - '6' - channel: candidate ceph-mon: charm: cs:~openstack-charmers/ceph-mon @@ -72,7 +69,6 @@ applications: - '7' - '8' - '9' - channel: candidate keystone: expose: True @@ -82,18 +78,15 @@ applications: openstack-origin: *source to: - '10' - channel: candidate vault-mysql-router: charm: cs:~openstack-charmers/mysql-router - channel: candidate vault: charm: cs:~openstack-charmers/vault num_units: 1 to: - '11' - channel: candidate relations: diff --git a/tests/bundles/focal-wallaby.yaml b/tests/bundles/focal-wallaby.yaml index 19249ecb..70674421 100644 --- a/tests/bundles/focal-wallaby.yaml +++ b/tests/bundles/focal-wallaby.yaml @@ -26,7 +26,6 @@ applications: keystone-mysql-router: charm: cs:~openstack-charmers/mysql-router - channel: candidate mysql-innodb-cluster: charm: cs:~openstack-charmers/mysql-innodb-cluster @@ -37,7 +36,6 @@ applications: - '0' - '1' - '2' - channel: candidate ceph-radosgw: charm: ceph-radosgw @@ -60,7 +58,6 @@ applications: - '4' - '5' - '6' - channel: candidate ceph-mon: charm: cs:~openstack-charmers/ceph-mon @@ -71,7 +68,6 @@ applications: - '7' - '8' - '9' - channel: candidate keystone: expose: True @@ -81,18 +77,15 @@ applications: openstack-origin: *source to: - '10' - channel: candidate vault-mysql-router: charm: cs:~openstack-charmers/mysql-router - channel: candidate vault: charm: cs:~openstack-charmers/vault num_units: 1 to: - '11' - channel: candidate relations: diff --git a/tests/bundles/focal-xena-namespaced.yaml b/tests/bundles/focal-xena-namespaced.yaml index 37315e4a..fcac97cc 100644 --- a/tests/bundles/focal-xena-namespaced.yaml +++ b/tests/bundles/focal-xena-namespaced.yaml @@ -26,7 +26,6 @@ applications: keystone-mysql-router: charm: cs:~openstack-charmers/mysql-router - channel: candidate mysql-innodb-cluster: charm: cs:~openstack-charmers/mysql-innodb-cluster @@ -37,7 +36,6 @@ applications: - '0' - '1' - '2' - channel: candidate ceph-radosgw: charm: ceph-radosgw @@ -61,7 +59,6 @@ applications: - '4' - '5' - '6' - channel: candidate ceph-mon: charm: cs:~openstack-charmers/ceph-mon @@ -72,7 +69,6 @@ applications: - '7' - '8' - '9' - channel: candidate keystone: expose: True @@ -82,18 +78,15 @@ applications: openstack-origin: *source to: - '10' - channel: candidate vault-mysql-router: charm: cs:~openstack-charmers/mysql-router - channel: candidate vault: charm: cs:~openstack-charmers/vault num_units: 1 to: - '11' - channel: candidate relations: diff --git a/tests/bundles/focal-xena.yaml b/tests/bundles/focal-xena.yaml index d9d1f501..b1979a9d 100644 --- a/tests/bundles/focal-xena.yaml +++ b/tests/bundles/focal-xena.yaml @@ -26,7 +26,6 @@ applications: keystone-mysql-router: charm: cs:~openstack-charmers/mysql-router - channel: candidate mysql-innodb-cluster: charm: cs:~openstack-charmers/mysql-innodb-cluster @@ -37,7 +36,6 @@ applications: - '0' - '1' - '2' - channel: candidate ceph-radosgw: charm: ceph-radosgw @@ -60,7 +58,6 @@ applications: - '4' - '5' - '6' - channel: candidate ceph-mon: charm: cs:~openstack-charmers/ceph-mon @@ -71,7 +68,6 @@ applications: - '7' - '8' - '9' - channel: candidate keystone: expose: True @@ -81,18 +77,15 @@ applications: openstack-origin: *source to: - '10' - channel: candidate vault-mysql-router: charm: cs:~openstack-charmers/mysql-router - channel: candidate vault: charm: cs:~openstack-charmers/vault num_units: 1 to: - '11' - channel: candidate relations: diff --git a/tests/bundles/groovy-victoria-namespaced.yaml b/tests/bundles/groovy-victoria-namespaced.yaml index 7b562acb..28bf2fff 100644 --- a/tests/bundles/groovy-victoria-namespaced.yaml +++ b/tests/bundles/groovy-victoria-namespaced.yaml @@ -26,7 +26,6 @@ applications: keystone-mysql-router: charm: cs:~openstack-charmers/mysql-router - channel: candidate mysql-innodb-cluster: charm: cs:~openstack-charmers/mysql-innodb-cluster @@ -37,7 +36,6 @@ applications: - '0' - '1' - '2' - channel: candidate ceph-radosgw: charm: ceph-radosgw @@ -61,7 +59,6 @@ applications: - '4' - '5' - '6' - channel: candidate ceph-mon: charm: cs:~openstack-charmers/ceph-mon @@ -72,7 +69,6 @@ applications: - '7' - '8' - '9' - channel: candidate keystone: expose: True @@ -82,18 +78,15 @@ applications: openstack-origin: *source to: - '10' - channel: candidate vault-mysql-router: charm: cs:~openstack-charmers/mysql-router - channel: candidate vault: charm: cs:~openstack-charmers/vault num_units: 1 to: - '11' - channel: candidate relations: diff --git a/tests/bundles/groovy-victoria.yaml b/tests/bundles/groovy-victoria.yaml index 63839770..5135772d 100644 --- a/tests/bundles/groovy-victoria.yaml +++ b/tests/bundles/groovy-victoria.yaml @@ -26,7 +26,6 @@ applications: keystone-mysql-router: charm: cs:~openstack-charmers/mysql-router - channel: candidate mysql-innodb-cluster: charm: cs:~openstack-charmers/mysql-innodb-cluster @@ -37,7 +36,6 @@ applications: - '0' - '1' - '2' - channel: candidate ceph-radosgw: charm: ceph-radosgw @@ -60,7 +58,6 @@ applications: - '4' - '5' - '6' - channel: candidate ceph-mon: charm: cs:~openstack-charmers/ceph-mon @@ -71,7 +68,6 @@ applications: - '7' - '8' - '9' - channel: candidate keystone: expose: True @@ -81,18 +77,15 @@ applications: openstack-origin: *source to: - '10' - channel: candidate vault-mysql-router: charm: cs:~openstack-charmers/mysql-router - channel: candidate vault: charm: cs:~openstack-charmers/vault num_units: 1 to: - '11' - channel: candidate relations: diff --git a/tests/bundles/hirsute-wallaby-namespaced.yaml b/tests/bundles/hirsute-wallaby-namespaced.yaml index 68f84c87..ee763f48 100644 --- a/tests/bundles/hirsute-wallaby-namespaced.yaml +++ b/tests/bundles/hirsute-wallaby-namespaced.yaml @@ -26,7 +26,6 @@ applications: keystone-mysql-router: charm: cs:~openstack-charmers/mysql-router - channel: candidate mysql-innodb-cluster: charm: cs:~openstack-charmers/mysql-innodb-cluster @@ -37,7 +36,6 @@ applications: - '0' - '1' - '2' - channel: candidate ceph-radosgw: charm: ceph-radosgw @@ -61,7 +59,6 @@ applications: - '4' - '5' - '6' - channel: candidate ceph-mon: charm: cs:~openstack-charmers/ceph-mon @@ -72,7 +69,6 @@ applications: - '7' - '8' - '9' - channel: candidate keystone: expose: True @@ -82,18 +78,15 @@ applications: openstack-origin: *source to: - '10' - channel: candidate vault-mysql-router: charm: cs:~openstack-charmers/mysql-router - channel: candidate vault: charm: cs:~openstack-charmers/vault num_units: 1 to: - '11' - channel: candidate relations: diff --git a/tests/bundles/hirsute-wallaby.yaml b/tests/bundles/hirsute-wallaby.yaml index 0ef5e99b..6097db80 100644 --- a/tests/bundles/hirsute-wallaby.yaml +++ b/tests/bundles/hirsute-wallaby.yaml @@ -26,7 +26,6 @@ applications: keystone-mysql-router: charm: cs:~openstack-charmers/mysql-router - channel: candidate mysql-innodb-cluster: charm: cs:~openstack-charmers/mysql-innodb-cluster @@ -37,7 +36,6 @@ applications: - '0' - '1' - '2' - channel: candidate ceph-radosgw: charm: ceph-radosgw @@ -60,7 +58,6 @@ applications: - '4' - '5' - '6' - channel: candidate ceph-mon: charm: cs:~openstack-charmers/ceph-mon @@ -71,7 +68,6 @@ applications: - '7' - '8' - '9' - channel: candidate keystone: expose: True @@ -81,18 +77,15 @@ applications: openstack-origin: *source to: - '10' - channel: candidate vault-mysql-router: charm: cs:~openstack-charmers/mysql-router - channel: candidate vault: charm: cs:~openstack-charmers/vault num_units: 1 to: - '11' - channel: candidate relations: diff --git a/tests/bundles/impish-xena-namespaced.yaml b/tests/bundles/impish-xena-namespaced.yaml index 61c08759..ea42ae5d 100644 --- a/tests/bundles/impish-xena-namespaced.yaml +++ b/tests/bundles/impish-xena-namespaced.yaml @@ -26,7 +26,6 @@ applications: keystone-mysql-router: charm: cs:~openstack-charmers/mysql-router - channel: candidate mysql-innodb-cluster: charm: cs:~openstack-charmers/mysql-innodb-cluster @@ -37,7 +36,6 @@ applications: - '0' - '1' - '2' - channel: candidate ceph-radosgw: charm: ceph-radosgw @@ -61,7 +59,6 @@ applications: - '4' - '5' - '6' - channel: candidate ceph-mon: charm: cs:~openstack-charmers/ceph-mon @@ -72,7 +69,6 @@ applications: - '7' - '8' - '9' - channel: candidate keystone: expose: True @@ -82,18 +78,15 @@ applications: openstack-origin: *source to: - '10' - channel: candidate vault-mysql-router: charm: cs:~openstack-charmers/mysql-router - channel: candidate vault: charm: cs:~openstack-charmers/vault num_units: 1 to: - '11' - channel: candidate relations: diff --git a/tests/bundles/impish-xena.yaml b/tests/bundles/impish-xena.yaml index 1a3bea17..4112635e 100644 --- a/tests/bundles/impish-xena.yaml +++ b/tests/bundles/impish-xena.yaml @@ -26,7 +26,6 @@ applications: keystone-mysql-router: charm: cs:~openstack-charmers/mysql-router - channel: candidate mysql-innodb-cluster: charm: cs:~openstack-charmers/mysql-innodb-cluster @@ -37,7 +36,6 @@ applications: - '0' - '1' - '2' - channel: candidate ceph-radosgw: charm: ceph-radosgw @@ -60,7 +58,6 @@ applications: - '4' - '5' - '6' - channel: candidate ceph-mon: charm: cs:~openstack-charmers/ceph-mon @@ -71,7 +68,6 @@ applications: - '7' - '8' - '9' - channel: candidate keystone: expose: True @@ -81,18 +77,15 @@ applications: openstack-origin: *source to: - '10' - channel: candidate vault-mysql-router: charm: cs:~openstack-charmers/mysql-router - channel: candidate vault: charm: cs:~openstack-charmers/vault num_units: 1 to: - '11' - channel: candidate relations: diff --git a/tests/bundles/trusty-mitaka.yaml b/tests/bundles/trusty-mitaka.yaml index a5bb31e9..5e81c5b2 100644 --- a/tests/bundles/trusty-mitaka.yaml +++ b/tests/bundles/trusty-mitaka.yaml @@ -17,13 +17,11 @@ applications: options: source: *source osd-devices: '/srv/ceph /dev/test-non-existent' - channel: candidate ceph-mon: charm: cs:~openstack-charmers/ceph-mon num_units: 3 options: source: *source - channel: candidate percona-cluster: charm: cs:trusty/percona-cluster num_units: 1 @@ -33,7 +31,6 @@ applications: num_units: 1 options: openstack-origin: *source - channel: candidate relations: - - keystone:shared-db - percona-cluster:shared-db diff --git a/tests/bundles/xenial-mitaka-namespaced.yaml b/tests/bundles/xenial-mitaka-namespaced.yaml index 9afc67b4..59b59e25 100644 --- a/tests/bundles/xenial-mitaka-namespaced.yaml +++ b/tests/bundles/xenial-mitaka-namespaced.yaml @@ -18,24 +18,20 @@ applications: options: source: *source osd-devices: '/srv/ceph /dev/test-non-existent' - channel: candidate ceph-mon: charm: cs:~openstack-charmers/ceph-mon num_units: 3 options: source: *source - channel: candidate percona-cluster: charm: cs:~openstack-charmers/percona-cluster num_units: 1 - channel: candidate keystone: expose: True charm: cs:~openstack-charmers/keystone num_units: 1 options: openstack-origin: *source - channel: candidate relations: - - keystone:shared-db - percona-cluster:shared-db diff --git a/tests/bundles/xenial-mitaka.yaml b/tests/bundles/xenial-mitaka.yaml index f25afc1d..a8230cf7 100644 --- a/tests/bundles/xenial-mitaka.yaml +++ b/tests/bundles/xenial-mitaka.yaml @@ -17,24 +17,20 @@ applications: options: source: *source osd-devices: '/srv/ceph /dev/test-non-existent' - channel: candidate ceph-mon: charm: cs:~openstack-charmers/ceph-mon num_units: 3 options: source: *source - channel: candidate percona-cluster: charm: cs:~openstack-charmers/percona-cluster num_units: 1 - channel: candidate keystone: expose: True charm: cs:~openstack-charmers/keystone num_units: 1 options: openstack-origin: *source - channel: candidate relations: - - keystone:shared-db - percona-cluster:shared-db diff --git a/tests/bundles/xenial-ocata.yaml b/tests/bundles/xenial-ocata.yaml index fecdf569..9bc72313 100644 --- a/tests/bundles/xenial-ocata.yaml +++ b/tests/bundles/xenial-ocata.yaml @@ -17,24 +17,20 @@ applications: options: source: *source osd-devices: '/srv/ceph /dev/test-non-existent' - channel: candidate ceph-mon: charm: cs:~openstack-charmers/ceph-mon num_units: 3 options: source: *source - channel: candidate percona-cluster: charm: cs:~openstack-charmers/percona-cluster num_units: 1 - channel: candidate keystone: expose: True charm: cs:~openstack-charmers/keystone num_units: 1 options: openstack-origin: *source - channel: candidate relations: - - keystone:shared-db - percona-cluster:shared-db diff --git a/tests/bundles/xenial-pike.yaml b/tests/bundles/xenial-pike.yaml index a8f8a962..bb051552 100644 --- a/tests/bundles/xenial-pike.yaml +++ b/tests/bundles/xenial-pike.yaml @@ -17,24 +17,20 @@ applications: options: source: *source osd-devices: '/srv/ceph /dev/test-non-existent' - channel: candidate ceph-mon: charm: cs:~openstack-charmers/ceph-mon num_units: 3 options: source: *source - channel: candidate percona-cluster: charm: cs:~openstack-charmers/percona-cluster num_units: 1 - channel: candidate keystone: expose: True charm: cs:~openstack-charmers/keystone num_units: 1 options: openstack-origin: *source - channel: candidate relations: - - keystone:shared-db - percona-cluster:shared-db diff --git a/tests/bundles/xenial-queens.yaml b/tests/bundles/xenial-queens.yaml index 92d2c9e9..0d0cbd9f 100644 --- a/tests/bundles/xenial-queens.yaml +++ b/tests/bundles/xenial-queens.yaml @@ -17,28 +17,23 @@ applications: options: source: *source osd-devices: '/srv/ceph /dev/test-non-existent' - channel: candidate ceph-mon: charm: cs:~openstack-charmers/ceph-mon num_units: 3 options: source: *source - channel: candidate percona-cluster: charm: cs:~openstack-charmers/percona-cluster num_units: 1 - channel: candidate keystone: expose: True charm: cs:~openstack-charmers/keystone num_units: 1 options: openstack-origin: *source - channel: candidate vault: charm: cs:~openstack-charmers/vault num_units: 1 - channel: candidate relations: - - keystone:shared-db - percona-cluster:shared-db