diff --git a/tests/bundles/bionic-queens.yaml b/tests/bundles/bionic-queens.yaml index b4205b8..4149d0e 100644 --- a/tests/bundles/bionic-queens.yaml +++ b/tests/bundles/bionic-queens.yaml @@ -14,17 +14,14 @@ applications: options: dataset-size: 25% max-connections: 1000 - channel: candidate keystone: expose: True charm: cs:~openstack-charmers/keystone num_units: 1 - channel: candidate glance: expose: True charm: cs:~openstack-charmers/glance num_units: 1 - channel: candidate swift-storage: charm: cs:~openstack-charmers/swift-storage num_units: 1 @@ -32,7 +29,6 @@ applications: block-devices: 'cinder,10G' options: zone: 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 4022503..f9e6613 100644 --- a/tests/bundles/bionic-rocky.yaml +++ b/tests/bundles/bionic-rocky.yaml @@ -16,21 +16,18 @@ applications: dataset-size: 25% max-connections: 1000 source: cloud:bionic-rocky - channel: candidate keystone: expose: True charm: cs:~openstack-charmers/keystone num_units: 1 options: openstack-origin: cloud:bionic-rocky - channel: candidate glance: expose: True charm: cs:~openstack-charmers/glance num_units: 1 options: openstack-origin: cloud:bionic-rocky - channel: candidate swift-storage: charm: cs:~openstack-charmers/swift-storage num_units: 1 @@ -39,7 +36,6 @@ applications: options: openstack-origin: cloud:bionic-rocky zone: 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 c6a1825..02dc4fe 100644 --- a/tests/bundles/bionic-stein.yaml +++ b/tests/bundles/bionic-stein.yaml @@ -16,21 +16,18 @@ applications: dataset-size: 25% max-connections: 1000 source: cloud:bionic-stein - channel: candidate keystone: expose: True charm: cs:~openstack-charmers/keystone num_units: 1 options: openstack-origin: cloud:bionic-stein - channel: candidate glance: expose: True charm: cs:~openstack-charmers/glance num_units: 1 options: openstack-origin: cloud:bionic-stein - channel: candidate swift-storage: charm: cs:~openstack-charmers/swift-storage num_units: 1 @@ -39,7 +36,6 @@ applications: options: openstack-origin: cloud:bionic-stein zone: 1 - channel: candidate relations: - - keystone:shared-db - percona-cluster:shared-db diff --git a/tests/bundles/bionic-train-gr-r1.yaml b/tests/bundles/bionic-train-gr-r1.yaml index 8322baf..b06cc8b 100644 --- a/tests/bundles/bionic-train-gr-r1.yaml +++ b/tests/bundles/bionic-train-gr-r1.yaml @@ -22,7 +22,6 @@ applications: zone: 1 block-device: /etc/swift/storage.img|2G openstack-origin: cloud:bionic-train - channel: candidate swift-storage-region1-zone2: charm: cs:~openstack-charmers/swift-storage num_units: 1 @@ -31,7 +30,6 @@ applications: zone: 2 block-device: /etc/swift/storage.img|2G openstack-origin: cloud:bionic-train - channel: candidate swift-storage-region1-zone3: charm: cs:~openstack-charmers/swift-storage num_units: 1 @@ -40,7 +38,6 @@ applications: zone: 3 block-device: /etc/swift/storage.img|2G openstack-origin: cloud:bionic-train - channel: candidate percona-cluster: charm: cs:~openstack-charmers/percona-cluster num_units: 1 @@ -48,21 +45,18 @@ applications: dataset-size: 25% max-connections: 1000 source: cloud:bionic-train - channel: candidate keystone: expose: True charm: cs:~openstack-charmers/keystone num_units: 1 options: openstack-origin: cloud:bionic-train - channel: candidate glance: expose: True charm: cs:~openstack-charmers/glance num_units: 1 options: openstack-origin: cloud:bionic-train - channel: candidate relations: - - swift-proxy-region1:swift-storage - swift-storage-region1-zone1:swift-storage diff --git a/tests/bundles/bionic-train-gr-r2.yaml b/tests/bundles/bionic-train-gr-r2.yaml index c4f0a38..3623d3b 100644 --- a/tests/bundles/bionic-train-gr-r2.yaml +++ b/tests/bundles/bionic-train-gr-r2.yaml @@ -22,7 +22,6 @@ applications: zone: 1 block-device: /etc/swift/storage.img|2G openstack-origin: cloud:bionic-train - channel: candidate swift-storage-region2-zone2: charm: cs:~openstack-charmers/swift-storage num_units: 1 @@ -31,7 +30,6 @@ applications: zone: 2 block-device: /etc/swift/storage.img|2G openstack-origin: cloud:bionic-train - channel: candidate swift-storage-region2-zone3: charm: cs:~openstack-charmers/swift-storage num_units: 1 @@ -40,7 +38,6 @@ applications: zone: 3 block-device: /etc/swift/storage.img|2G openstack-origin: cloud:bionic-train - channel: candidate relations: - - swift-proxy-region2:swift-storage - swift-storage-region2-zone1:swift-storage diff --git a/tests/bundles/bionic-train.yaml b/tests/bundles/bionic-train.yaml index 2e2786a..05f0ca1 100644 --- a/tests/bundles/bionic-train.yaml +++ b/tests/bundles/bionic-train.yaml @@ -16,21 +16,18 @@ applications: dataset-size: 25% max-connections: 1000 source: cloud:bionic-train - channel: candidate keystone: expose: True charm: cs:~openstack-charmers/keystone num_units: 1 options: openstack-origin: cloud:bionic-train - channel: candidate glance: expose: True charm: cs:~openstack-charmers/glance num_units: 1 options: openstack-origin: cloud:bionic-train - channel: candidate swift-storage: charm: cs:~openstack-charmers/swift-storage num_units: 1 @@ -39,7 +36,6 @@ applications: options: openstack-origin: cloud:bionic-train zone: 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 1f0f97c..90f08e1 100644 --- a/tests/bundles/bionic-ussuri.yaml +++ b/tests/bundles/bionic-ussuri.yaml @@ -16,21 +16,18 @@ applications: dataset-size: 25% max-connections: 1000 source: cloud:bionic-ussuri - channel: candidate keystone: expose: True charm: cs:~openstack-charmers/keystone num_units: 1 options: openstack-origin: cloud:bionic-ussuri - channel: candidate glance: expose: True charm: cs:~openstack-charmers/glance num_units: 1 options: openstack-origin: cloud:bionic-ussuri - channel: candidate swift-storage: charm: cs:~openstack-charmers/swift-storage num_units: 1 @@ -39,7 +36,6 @@ applications: options: openstack-origin: cloud:bionic-ussuri zone: 1 - channel: candidate relations: - - keystone:shared-db - percona-cluster:shared-db diff --git a/tests/bundles/focal-ussuri.yaml b/tests/bundles/focal-ussuri.yaml index a11621f..72c3f6a 100644 --- a/tests/bundles/focal-ussuri.yaml +++ b/tests/bundles/focal-ussuri.yaml @@ -21,10 +21,8 @@ applications: keystone-mysql-router: charm: cs:~openstack-charmers/mysql-router - channel: candidate glance-mysql-router: charm: cs:~openstack-charmers/mysql-router - channel: candidate mysql-innodb-cluster: charm: cs:~openstack-charmers/mysql-innodb-cluster @@ -35,7 +33,6 @@ applications: - '0' - '1' - '2' - channel: candidate keystone: expose: True @@ -45,7 +42,6 @@ applications: openstack-origin: *openstack-origin to: - '3' - channel: candidate swift-proxy: charm: swift-proxy @@ -66,7 +62,6 @@ applications: openstack-origin: *openstack-origin to: - '5' - channel: candidate swift-storage: charm: cs:~openstack-charmers/swift-storage @@ -78,7 +73,6 @@ applications: openstack-origin: *openstack-origin to: - '6' - channel: candidate relations: diff --git a/tests/bundles/focal-victoria.yaml b/tests/bundles/focal-victoria.yaml index 252c86d..73f9773 100644 --- a/tests/bundles/focal-victoria.yaml +++ b/tests/bundles/focal-victoria.yaml @@ -21,10 +21,8 @@ applications: keystone-mysql-router: charm: cs:~openstack-charmers/mysql-router - channel: candidate glance-mysql-router: charm: cs:~openstack-charmers/mysql-router - channel: candidate mysql-innodb-cluster: charm: cs:~openstack-charmers/mysql-innodb-cluster @@ -35,7 +33,6 @@ applications: - '0' - '1' - '2' - channel: candidate keystone: expose: True @@ -45,7 +42,6 @@ applications: openstack-origin: *openstack-origin to: - '3' - channel: candidate swift-proxy: charm: swift-proxy @@ -66,7 +62,6 @@ applications: openstack-origin: *openstack-origin to: - '5' - channel: candidate swift-storage: charm: cs:~openstack-charmers/swift-storage @@ -78,7 +73,6 @@ applications: openstack-origin: *openstack-origin to: - '6' - channel: candidate relations: diff --git a/tests/bundles/focal-wallaby.yaml b/tests/bundles/focal-wallaby.yaml index c366ea1..3bac29c 100644 --- a/tests/bundles/focal-wallaby.yaml +++ b/tests/bundles/focal-wallaby.yaml @@ -21,10 +21,8 @@ applications: keystone-mysql-router: charm: cs:~openstack-charmers/mysql-router - channel: candidate glance-mysql-router: charm: cs:~openstack-charmers/mysql-router - channel: candidate mysql-innodb-cluster: charm: cs:~openstack-charmers/mysql-innodb-cluster @@ -35,7 +33,6 @@ applications: - '0' - '1' - '2' - channel: candidate keystone: expose: True @@ -45,7 +42,6 @@ applications: openstack-origin: *openstack-origin to: - '3' - channel: candidate swift-proxy: charm: swift-proxy @@ -66,7 +62,6 @@ applications: openstack-origin: *openstack-origin to: - '5' - channel: candidate swift-storage: charm: cs:~openstack-charmers/swift-storage @@ -78,7 +73,6 @@ applications: openstack-origin: *openstack-origin to: - '6' - channel: candidate relations: diff --git a/tests/bundles/focal-xena.yaml b/tests/bundles/focal-xena.yaml index 684e307..f703cec 100644 --- a/tests/bundles/focal-xena.yaml +++ b/tests/bundles/focal-xena.yaml @@ -21,10 +21,8 @@ applications: keystone-mysql-router: charm: cs:~openstack-charmers/mysql-router - channel: candidate glance-mysql-router: charm: cs:~openstack-charmers/mysql-router - channel: candidate mysql-innodb-cluster: charm: cs:~openstack-charmers/mysql-innodb-cluster @@ -35,7 +33,6 @@ applications: - '0' - '1' - '2' - channel: candidate keystone: expose: True @@ -45,7 +42,6 @@ applications: openstack-origin: *openstack-origin to: - '3' - channel: candidate swift-proxy: charm: swift-proxy @@ -66,7 +62,6 @@ applications: openstack-origin: *openstack-origin to: - '5' - channel: candidate swift-storage: charm: cs:~openstack-charmers/swift-storage @@ -78,7 +73,6 @@ applications: openstack-origin: *openstack-origin to: - '6' - channel: candidate relations: diff --git a/tests/bundles/hirsute-wallaby.yaml b/tests/bundles/hirsute-wallaby.yaml index ae65f73..cd1326c 100644 --- a/tests/bundles/hirsute-wallaby.yaml +++ b/tests/bundles/hirsute-wallaby.yaml @@ -21,10 +21,8 @@ applications: keystone-mysql-router: charm: cs:~openstack-charmers/mysql-router - channel: candidate glance-mysql-router: charm: cs:~openstack-charmers/mysql-router - channel: candidate mysql-innodb-cluster: charm: cs:~openstack-charmers/mysql-innodb-cluster @@ -35,7 +33,6 @@ applications: - '0' - '1' - '2' - channel: candidate keystone: expose: True @@ -45,7 +42,6 @@ applications: openstack-origin: *openstack-origin to: - '3' - channel: candidate swift-proxy: charm: swift-proxy @@ -66,7 +62,6 @@ applications: openstack-origin: *openstack-origin to: - '5' - channel: candidate swift-storage: charm: cs:~openstack-charmers/swift-storage @@ -78,7 +73,6 @@ applications: openstack-origin: *openstack-origin to: - '6' - channel: candidate relations: diff --git a/tests/bundles/impish-xena.yaml b/tests/bundles/impish-xena.yaml index 23ff175..d32c6e9 100644 --- a/tests/bundles/impish-xena.yaml +++ b/tests/bundles/impish-xena.yaml @@ -21,10 +21,8 @@ applications: keystone-mysql-router: charm: cs:~openstack-charmers/mysql-router - channel: candidate glance-mysql-router: charm: cs:~openstack-charmers/mysql-router - channel: candidate mysql-innodb-cluster: charm: cs:~openstack-charmers/mysql-innodb-cluster @@ -35,7 +33,6 @@ applications: - '0' - '1' - '2' - channel: candidate keystone: expose: True @@ -45,7 +42,6 @@ applications: openstack-origin: *openstack-origin to: - '3' - channel: candidate swift-proxy: charm: swift-proxy @@ -66,7 +62,6 @@ applications: openstack-origin: *openstack-origin to: - '5' - channel: candidate swift-storage: charm: cs:~openstack-charmers/swift-storage @@ -78,7 +73,6 @@ applications: openstack-origin: *openstack-origin to: - '6' - channel: candidate relations: diff --git a/tests/bundles/trusty-mitaka.yaml b/tests/bundles/trusty-mitaka.yaml index b02c8c0..5eed7e2 100644 --- a/tests/bundles/trusty-mitaka.yaml +++ b/tests/bundles/trusty-mitaka.yaml @@ -22,14 +22,12 @@ applications: num_units: 1 options: openstack-origin: cloud:trusty-mitaka - channel: candidate glance: expose: True charm: cs:~openstack-charmers/glance num_units: 1 options: openstack-origin: cloud:trusty-mitaka - channel: candidate swift-storage: charm: cs:~openstack-charmers/swift-storage num_units: 1 @@ -38,7 +36,6 @@ applications: options: openstack-origin: cloud:trusty-mitaka zone: 1 - 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 122e9c2..58997be 100644 --- a/tests/bundles/xenial-mitaka.yaml +++ b/tests/bundles/xenial-mitaka.yaml @@ -14,17 +14,14 @@ applications: options: dataset-size: 25% max-connections: 1000 - channel: candidate keystone: expose: True charm: cs:~openstack-charmers/keystone num_units: 1 - channel: candidate glance: expose: True charm: cs:~openstack-charmers/glance num_units: 1 - channel: candidate swift-storage: charm: cs:~openstack-charmers/swift-storage num_units: 1 @@ -32,7 +29,6 @@ applications: block-devices: 'cinder,10G' options: zone: 1 - 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 b704683..b74eec0 100644 --- a/tests/bundles/xenial-ocata.yaml +++ b/tests/bundles/xenial-ocata.yaml @@ -16,21 +16,18 @@ applications: dataset-size: 25% max-connections: 1000 source: cloud:xenial-ocata - channel: candidate keystone: expose: True charm: cs:~openstack-charmers/keystone num_units: 1 options: openstack-origin: cloud:xenial-ocata - channel: candidate glance: expose: True charm: cs:~openstack-charmers/glance num_units: 1 options: openstack-origin: cloud:xenial-ocata - channel: candidate swift-storage: charm: cs:~openstack-charmers/swift-storage num_units: 1 @@ -39,7 +36,6 @@ applications: options: openstack-origin: cloud:xenial-ocata zone: 1 - 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 03ee687..68b72b0 100644 --- a/tests/bundles/xenial-pike.yaml +++ b/tests/bundles/xenial-pike.yaml @@ -16,21 +16,18 @@ applications: dataset-size: 25% max-connections: 1000 source: cloud:xenial-pike - channel: candidate keystone: expose: True charm: cs:~openstack-charmers/keystone num_units: 1 options: openstack-origin: cloud:xenial-pike - channel: candidate glance: expose: True charm: cs:~openstack-charmers/glance num_units: 1 options: openstack-origin: cloud:xenial-pike - channel: candidate swift-storage: charm: cs:~openstack-charmers/swift-storage num_units: 1 @@ -39,7 +36,6 @@ applications: options: openstack-origin: cloud:xenial-pike zone: 1 - 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 a86972b..1351e40 100644 --- a/tests/bundles/xenial-queens.yaml +++ b/tests/bundles/xenial-queens.yaml @@ -16,21 +16,18 @@ applications: dataset-size: 25% max-connections: 1000 source: cloud:xenial-queens - channel: candidate keystone: expose: True charm: cs:~openstack-charmers/keystone num_units: 1 options: openstack-origin: cloud:xenial-queens - channel: candidate glance: expose: True charm: cs:~openstack-charmers/glance num_units: 1 options: openstack-origin: cloud:xenial-queens - channel: candidate swift-storage: charm: cs:~openstack-charmers/swift-storage num_units: 1 @@ -39,7 +36,6 @@ applications: options: openstack-origin: cloud:xenial-queens zone: 1 - channel: candidate relations: - - keystone:shared-db - percona-cluster:shared-db