From 0b04effc33eda01c385bcfc4070e80124004d8f7 Mon Sep 17 00:00:00 2001 From: Alex Kavanagh Date: Thu, 27 Jan 2022 11:47:44 +0000 Subject: [PATCH] Migrate charm to charmhub latest/edge track Change-Id: I6908767be9c8f8897b95dcae28b9d5f75ab916d6 --- charmcraft.yaml | 13 + metadata.yaml | 1 + osci.yaml | 13 +- src/metadata.yaml | 3 - src/tests/bundles/bionic-queens-swift-v2.yaml | 140 -------- src/tests/bundles/bionic-queens-swift-v3.yaml | 135 -------- src/tests/bundles/bionic-stein.yaml | 156 --------- src/tests/bundles/bionic-ussuri.yaml | 273 ---------------- src/tests/bundles/focal-ussuri.yaml | 307 ------------------ src/tests/bundles/focal-victoria.yaml | 307 ------------------ src/tests/bundles/focal-wallaby.yaml | 307 ------------------ src/tests/bundles/focal-xena.yaml | 63 ++-- src/tests/bundles/focal-yoga.yaml | 63 ++-- src/tests/bundles/hirsute-wallaby.yaml | 307 ------------------ src/tests/bundles/impish-xena.yaml | 63 ++-- src/tests/bundles/jammy-yoga.yaml | 63 ++-- src/tests/tests.yaml | 10 +- 17 files changed, 186 insertions(+), 2038 deletions(-) create mode 100644 charmcraft.yaml create mode 120000 metadata.yaml delete mode 100644 src/tests/bundles/bionic-queens-swift-v2.yaml delete mode 100644 src/tests/bundles/bionic-queens-swift-v3.yaml delete mode 100644 src/tests/bundles/bionic-stein.yaml delete mode 100644 src/tests/bundles/bionic-ussuri.yaml delete mode 100644 src/tests/bundles/focal-ussuri.yaml delete mode 100644 src/tests/bundles/focal-victoria.yaml delete mode 100644 src/tests/bundles/focal-wallaby.yaml delete mode 100644 src/tests/bundles/hirsute-wallaby.yaml diff --git a/charmcraft.yaml b/charmcraft.yaml new file mode 100644 index 0000000..a850351 --- /dev/null +++ b/charmcraft.yaml @@ -0,0 +1,13 @@ +type: charm + +parts: + charm: + source: src/ + plugin: reactive + build-snaps: [charm] + +bases: + - name: ubuntu + channel: "20.04" + architectures: + - amd64 diff --git a/metadata.yaml b/metadata.yaml new file mode 120000 index 0000000..0768683 --- /dev/null +++ b/metadata.yaml @@ -0,0 +1 @@ +src/metadata.yaml \ No newline at end of file diff --git a/osci.yaml b/osci.yaml index 6c2751d..547c006 100644 --- a/osci.yaml +++ b/osci.yaml @@ -1,16 +1,9 @@ - project: templates: - - charm-yoga-unit-jobs - - charm-yoga-functional-jobs + - charm-unit-jobs-py38 + - charm-unit-jobs-py39 - charm-xena-functional-jobs - - charm-wallaby-functional-jobs - - charm-victoria-functional-jobs - - charm-ussuri-functional-jobs - - charm-stein-functional-jobs - check: - jobs: - - bionic-queens-swift-v2 - - bionic-queens-swift-v3 + - charm-yoga-functional-jobs vars: needs_charm_build: true charm_build_name: cinder-backup-swift-proxy diff --git a/src/metadata.yaml b/src/metadata.yaml index 237f012..c6cc414 100644 --- a/src/metadata.yaml +++ b/src/metadata.yaml @@ -8,10 +8,7 @@ description: | tags: - misc series: -- bionic - focal -- groovy -- hirsute - impish subordinate: true provides: diff --git a/src/tests/bundles/bionic-queens-swift-v2.yaml b/src/tests/bundles/bionic-queens-swift-v2.yaml deleted file mode 100644 index 95dadd5..0000000 --- a/src/tests/bundles/bionic-queens-swift-v2.yaml +++ /dev/null @@ -1,140 +0,0 @@ -series: bionic -relations: -- - nova-compute:amqp - - rabbitmq-server:amqp -- - keystone:shared-db - - mysql:shared-db -- - nova-cloud-controller:identity-service - - keystone:identity-service -- - glance:identity-service - - keystone:identity-service -- - glance:shared-db - - mysql:shared-db -- - glance:amqp - - rabbitmq-server:amqp -- - nova-cloud-controller:image-service - - glance:image-service -- - nova-compute:image-service - - glance:image-service -- - nova-cloud-controller:cloud-compute - - nova-compute:cloud-compute -- - nova-cloud-controller:amqp - - rabbitmq-server:amqp -- - nova-cloud-controller:shared-db - - mysql:shared-db -- - cinder:image-service - - glance:image-service -- - cinder:amqp - - rabbitmq-server:amqp -- - cinder:identity-service - - keystone:identity-service -- - cinder:cinder-volume-service - - nova-cloud-controller:cinder-volume-service -- - cinder-ceph:storage-backend - - cinder:storage-backend -- - cinder - - cinder-backup-swift-proxy -- - ceph-mon:client - - nova-compute:ceph -- - nova-compute:ceph-access - - cinder-ceph:ceph-access -- - cinder:shared-db - - mysql:shared-db -- - ceph-mon:client - - cinder-ceph:ceph -- - ceph-mon:client - - glance:ceph -- - ceph-osd:mon - - ceph-mon:osd - -# external swift service -- - swift-keystone:shared-db - - swift-mysql:shared-db -- - swift-proxy:identity-service - - swift-keystone:identity-service -- - swift-proxy:swift-storage - - swift-storage:swift-storage - -applications: - ceph-mon: - charm: cs:~openstack-charmers-next/ceph-mon - num_units: 3 - options: - monitor-count: '3' - ceph-osd: - charm: cs:~openstack-charmers-next/ceph-osd - num_units: 3 - storage: - osd-devices: 'cinder,10G' - cinder: - charm: cs:~openstack-charmers-next/cinder - num_units: 1 - options: - block-device: None - glance-api-version: 2 - cinder-ceph: - charm: cs:~openstack-charmers-next/cinder-ceph - num_units: 0 - cinder-backup-swift-proxy: - charm: cinder-backup-swift-proxy - num_units: 0 - options: - auth-version: 3 - swift-user: admin - swift-key: openstack - user-domain: admin_domain - project-domain: admin_domain - project-name: admin - glance: - charm: cs:~openstack-charmers-next/glance - num_units: 1 - keystone: - charm: cs:~openstack-charmers-next/keystone - num_units: 1 - mysql: - charm: cs:~openstack-charmers-next/percona-cluster - num_units: 1 - options: - dataset-size: 25% - max-connections: 1000 - nova-cloud-controller: - charm: cs:~openstack-charmers-next/nova-cloud-controller - num_units: 1 - rabbitmq-server: - charm: cs:~openstack-charmers-next/rabbitmq-server - num_units: 1 - nova-compute: - charm: cs:~openstack-charmers-next/nova-compute - num_units: 1 - -# external swift - swift-keystone: - series: xenial - charm: cs:~openstack-charmers-next/keystone - num_units: 1 - options: - admin-password: openstack - preferred-api-version: 3 - swift-mysql: - series: xenial - charm: cs:~openstack-charmers-next/percona-cluster - num_units: 1 - options: - dataset-size: 25% - max-connections: 1000 - swift-proxy: - series: xenial - charm: cs:~openstack-charmers-next/swift-proxy - num_units: 1 - options: - zone-assignment: manual - replicas: 1 - swift-storage: - series: xenial - charm: cs:~openstack-charmers-next/swift-storage - num_units: 1 - options: - zone: 1 - storage: - block-devices: 'cinder,10G' - diff --git a/src/tests/bundles/bionic-queens-swift-v3.yaml b/src/tests/bundles/bionic-queens-swift-v3.yaml deleted file mode 100644 index cfe6aba..0000000 --- a/src/tests/bundles/bionic-queens-swift-v3.yaml +++ /dev/null @@ -1,135 +0,0 @@ -series: bionic -relations: -- - nova-compute:amqp - - rabbitmq-server:amqp -- - keystone:shared-db - - mysql:shared-db -- - nova-cloud-controller:identity-service - - keystone:identity-service -- - glance:identity-service - - keystone:identity-service -- - glance:shared-db - - mysql:shared-db -- - glance:amqp - - rabbitmq-server:amqp -- - nova-cloud-controller:image-service - - glance:image-service -- - nova-compute:image-service - - glance:image-service -- - nova-cloud-controller:cloud-compute - - nova-compute:cloud-compute -- - nova-cloud-controller:amqp - - rabbitmq-server:amqp -- - nova-cloud-controller:shared-db - - mysql:shared-db -- - cinder:image-service - - glance:image-service -- - cinder:amqp - - rabbitmq-server:amqp -- - cinder:identity-service - - keystone:identity-service -- - cinder:cinder-volume-service - - nova-cloud-controller:cinder-volume-service -- - cinder-ceph:storage-backend - - cinder:storage-backend -- - cinder - - cinder-backup-swift-proxy -- - ceph-mon:client - - nova-compute:ceph -- - nova-compute:ceph-access - - cinder-ceph:ceph-access -- - cinder:shared-db - - mysql:shared-db -- - ceph-mon:client - - cinder-ceph:ceph -- - ceph-mon:client - - glance:ceph -- - ceph-osd:mon - - ceph-mon:osd - -# external swift service -- - swift-keystone:shared-db - - swift-mysql:shared-db -- - swift-proxy:identity-service - - swift-keystone:identity-service -- - swift-proxy:swift-storage - - swift-storage:swift-storage - -applications: - ceph-mon: - charm: cs:~openstack-charmers-next/ceph-mon - num_units: 3 - options: - monitor-count: '3' - ceph-osd: - charm: cs:~openstack-charmers-next/ceph-osd - num_units: 3 - storage: - osd-devices: 'cinder,10G' - cinder: - charm: cs:~openstack-charmers-next/cinder - num_units: 1 - options: - block-device: None - glance-api-version: 2 - cinder-ceph: - charm: cs:~openstack-charmers-next/cinder-ceph - num_units: 0 - cinder-backup-swift-proxy: - charm: cinder-backup-swift-proxy - num_units: 0 - options: - auth-version: 3 - swift-user: admin - swift-key: openstack - user-domain: admin_domain - project-domain: admin_domain - project-name: admin - glance: - charm: cs:~openstack-charmers-next/glance - num_units: 1 - keystone: - charm: cs:~openstack-charmers-next/keystone - num_units: 1 - mysql: - charm: cs:~openstack-charmers-next/percona-cluster - num_units: 1 - options: - dataset-size: 25% - max-connections: 1000 - nova-cloud-controller: - charm: cs:~openstack-charmers-next/nova-cloud-controller - num_units: 1 - rabbitmq-server: - charm: cs:~openstack-charmers-next/rabbitmq-server - num_units: 1 - nova-compute: - charm: cs:~openstack-charmers-next/nova-compute - num_units: 1 - -# external swift - swift-keystone: - charm: cs:~openstack-charmers-next/keystone - num_units: 1 - options: - admin-password: openstack - preferred-api-version: 3 - swift-mysql: - charm: cs:~openstack-charmers-next/percona-cluster - num_units: 1 - options: - dataset-size: 25% - max-connections: 1000 - swift-proxy: - charm: cs:~openstack-charmers-next/swift-proxy - num_units: 1 - options: - zone-assignment: manual - replicas: 1 - swift-storage: - charm: cs:~openstack-charmers-next/swift-storage - num_units: 1 - options: - zone: 1 - storage: - block-devices: 'cinder,10G' diff --git a/src/tests/bundles/bionic-stein.yaml b/src/tests/bundles/bionic-stein.yaml deleted file mode 100644 index aec8a87..0000000 --- a/src/tests/bundles/bionic-stein.yaml +++ /dev/null @@ -1,156 +0,0 @@ -variables: - openstack-origin: &openstack-origin cloud:bionic-stein - -series: bionic - -relations: -- - nova-compute:amqp - - rabbitmq-server:amqp -- - keystone:shared-db - - mysql:shared-db -- - nova-cloud-controller:identity-service - - keystone:identity-service -- - glance:identity-service - - keystone:identity-service -- - glance:shared-db - - mysql:shared-db -- - glance:amqp - - rabbitmq-server:amqp -- - nova-cloud-controller:image-service - - glance:image-service -- - nova-compute:image-service - - glance:image-service -- - nova-cloud-controller:cloud-compute - - nova-compute:cloud-compute -- - nova-cloud-controller:amqp - - rabbitmq-server:amqp -- - nova-cloud-controller:shared-db - - mysql:shared-db -- - cinder:image-service - - glance:image-service -- - cinder:amqp - - rabbitmq-server:amqp -- - cinder:identity-service - - keystone:identity-service -- - cinder:cinder-volume-service - - nova-cloud-controller:cinder-volume-service -- - cinder-ceph:storage-backend - - cinder:storage-backend -- - cinder - - cinder-backup-swift-proxy -- - ceph-mon:client - - nova-compute:ceph -- - nova-compute:ceph-access - - cinder-ceph:ceph-access -- - cinder:shared-db - - mysql:shared-db -- - ceph-mon:client - - cinder-ceph:ceph -- - ceph-mon:client - - glance:ceph -- - ceph-osd:mon - - ceph-mon:osd - -# external swift service -- - swift-keystone:shared-db - - swift-mysql:shared-db -- - swift-proxy:identity-service - - swift-keystone:identity-service -- - swift-proxy:swift-storage - - swift-storage:swift-storage - -applications: - ceph-mon: - charm: cs:~openstack-charmers-next/ceph-mon - num_units: 3 - options: - source: *openstack-origin - monitor-count: '3' - ceph-osd: - charm: cs:~openstack-charmers-next/ceph-osd - num_units: 3 - storage: - osd-devices: 'cinder,10G' - options: - source: *openstack-origin - cinder: - charm: cs:~openstack-charmers-next/cinder - num_units: 1 - options: - block-device: None - openstack-origin: *openstack-origin - glance-api-version: 2 - cinder-ceph: - charm: cs:~openstack-charmers-next/cinder-ceph - num_units: 0 - cinder-backup-swift-proxy: - charm: cinder-backup-swift-proxy - num_units: 0 - options: - auth-version: 3 - swift-user: admin - swift-key: openstack - user-domain: admin_domain - project-domain: admin_domain - project-name: admin - glance: - charm: cs:~openstack-charmers-next/glance - num_units: 1 - options: - openstack-origin: *openstack-origin - keystone: - charm: cs:~openstack-charmers-next/keystone - num_units: 1 - options: - openstack-origin: *openstack-origin - mysql: - charm: cs:~openstack-charmers-next/percona-cluster - num_units: 1 - options: - dataset-size: 25% - max-connections: 1000 - nova-cloud-controller: - charm: cs:~openstack-charmers-next/nova-cloud-controller - num_units: 1 - options: - openstack-origin: *openstack-origin - rabbitmq-server: - charm: cs:~openstack-charmers-next/rabbitmq-server - num_units: 1 - options: - source: *openstack-origin - nova-compute: - charm: cs:~openstack-charmers-next/nova-compute - num_units: 1 - options: - openstack-origin: *openstack-origin - -# external swift - swift-keystone: - charm: cs:~openstack-charmers-next/keystone - num_units: 1 - options: - openstack-origin: *openstack-origin - admin-password: openstack - preferred-api-version: 3 - swift-mysql: - charm: cs:~openstack-charmers-next/percona-cluster - num_units: 1 - options: - dataset-size: 25% - max-connections: 1000 - swift-proxy: - charm: cs:~openstack-charmers-next/swift-proxy - num_units: 1 - options: - openstack-origin: *openstack-origin - zone-assignment: manual - replicas: 1 - swift-storage: - charm: cs:~openstack-charmers-next/swift-storage - num_units: 1 - options: - openstack-origin: *openstack-origin - zone: 1 - storage: - block-devices: 'cinder,10G' diff --git a/src/tests/bundles/bionic-ussuri.yaml b/src/tests/bundles/bionic-ussuri.yaml deleted file mode 100644 index 74d129a..0000000 --- a/src/tests/bundles/bionic-ussuri.yaml +++ /dev/null @@ -1,273 +0,0 @@ -variables: - openstack-origin: &openstack-origin cloud:bionic-ussuri - -series: bionic - -comment: -- 'machines section to decide order of deployment. database sooner = faster' -machines: - '0': - constraints: mem=3072M - '1': - constraints: mem=3072M - '2': - constraints: mem=3072M - '3': - constraints: mem=3072M - '4': - '5': - '6': - '7': - '8': - '9': - '10': - '11': - '12': - '13': - '14': - '15': - constraints: mem=3072M - '16': - '17': - -applications: - - mysql: - charm: cs:~openstack-charmers-next/percona-cluster - num_units: 1 - options: - innodb-buffer-pool-size: 256M - max-connections: 1000 - to: - - '0' - - ceph-mon: - charm: cs:~openstack-charmers-next/ceph-mon - num_units: 3 - options: - source: *openstack-origin - monitor-count: '3' - to: - - '1' - - '2' - - '3' - - ceph-osd: - charm: cs:~openstack-charmers-next/ceph-osd - num_units: 3 - storage: - osd-devices: 'cinder,10G' - options: - source: *openstack-origin - osd-devices: '/dev/test-non-existent' - to: - - '4' - - '5' - - '6' - - cinder: - charm: cs:~openstack-charmers-next/cinder - num_units: 1 - options: - block-device: None - openstack-origin: *openstack-origin - glance-api-version: 2 - to: - - '7' - - cinder-ceph: - charm: cs:~openstack-charmers-next/cinder-ceph - num_units: 0 - - cinder-backup-swift-proxy: - charm: cinder-backup-swift-proxy - num_units: 0 - options: - auth-version: 3 - swift-user: admin - swift-key: openstack - user-domain: admin_domain - project-domain: admin_domain - project-name: admin - - glance: - charm: cs:~openstack-charmers-next/glance - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '8' - - keystone: - charm: cs:~openstack-charmers-next/keystone - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '9' - - nova-cloud-controller: - charm: cs:~openstack-charmers-next/nova-cloud-controller - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '10' - - rabbitmq-server: - charm: cs:~openstack-charmers-next/rabbitmq-server - num_units: 1 - options: - source: *openstack-origin - to: - - '11' - - nova-compute: - charm: cs:~openstack-charmers-next/nova-compute - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '12' - - placement: - charm: cs:~openstack-charmers-next/placement - num_units: 1 - constraints: mem=1G - options: - openstack-origin: *openstack-origin - to: - - '13' - -# external swift - swift-keystone: - charm: cs:~openstack-charmers-next/keystone - num_units: 1 - options: - openstack-origin: *openstack-origin - admin-password: openstack - preferred-api-version: 3 - to: - - '14' - - swift-mysql: - charm: cs:~openstack-charmers-next/percona-cluster - num_units: 1 - options: - dataset-size: 25% - max-connections: 1000 - to: - - '15' - - swift-proxy: - charm: cs:~openstack-charmers-next/swift-proxy - num_units: 1 - options: - openstack-origin: *openstack-origin - zone-assignment: manual - replicas: 1 - to: - - '16' - - swift-storage: - charm: cs:~openstack-charmers-next/swift-storage - num_units: 1 - options: - openstack-origin: *openstack-origin - zone: 1 - storage: - block-devices: 'cinder,10G' - to: - - '17' - - -relations: - - - - 'nova-compute:amqp' - - 'rabbitmq-server:amqp' - - - - 'keystone:shared-db' - - 'mysql:shared-db' - - - - 'nova-cloud-controller:identity-service' - - 'keystone:identity-service' - - - - 'glance:identity-service' - - 'keystone:identity-service' - - - - 'glance:shared-db' - - 'mysql:shared-db' - - - - 'glance:amqp' - - 'rabbitmq-server:amqp' - - - - 'nova-cloud-controller:image-service' - - 'glance:image-service' - - - - 'nova-compute:image-service' - - 'glance:image-service' - - - - 'nova-cloud-controller:cloud-compute' - - 'nova-compute:cloud-compute' - - - - 'nova-cloud-controller:amqp' - - 'rabbitmq-server:amqp' - - - - 'nova-cloud-controller:shared-db' - - 'mysql:shared-db' - - - - 'placement:shared-db' - - 'mysql:shared-db' - - - - 'placement:identity-service' - - 'keystone:identity-service' - - - - 'placement:placement' - - 'nova-cloud-controller:placement' - - - - 'cinder:image-service' - - 'glance:image-service' - - - - 'cinder:amqp' - - 'rabbitmq-server:amqp' - - - - 'cinder:identity-service' - - 'keystone:identity-service' - - - - 'cinder:cinder-volume-service' - - 'nova-cloud-controller:cinder-volume-service' - - - - 'cinder-ceph:storage-backend' - - 'cinder:storage-backend' - - - - 'cinder' - - 'cinder-backup-swift-proxy' - - - - 'ceph-mon:client' - - 'nova-compute:ceph' - - - - 'nova-compute:ceph-access' - - 'cinder-ceph:ceph-access' - - - - 'cinder:shared-db' - - 'mysql:shared-db' - - - - 'ceph-mon:client' - - 'cinder-ceph:ceph' - - - - 'ceph-mon:client' - - 'glance:ceph' - - - - 'ceph-osd:mon' - - 'ceph-mon:osd' - -# external swift service - - - 'swift-keystone:shared-db' - - 'swift-mysql:shared-db' - - - - 'swift-proxy:identity-service' - - 'swift-keystone:identity-service' - - - - 'swift-proxy:swift-storage' - - 'swift-storage:swift-storage' - diff --git a/src/tests/bundles/focal-ussuri.yaml b/src/tests/bundles/focal-ussuri.yaml deleted file mode 100644 index c64a85c..0000000 --- a/src/tests/bundles/focal-ussuri.yaml +++ /dev/null @@ -1,307 +0,0 @@ -variables: - openstack-origin: &openstack-origin distro - -series: focal - -comment: -- 'machines section to decide order of deployment. database sooner = faster' -machines: - '0': - constraints: mem=3072M - '1': - constraints: mem=3072M - '2': - constraints: mem=3072M - '3': - constraints: mem=3072M - '4': - constraints: mem=3072M - '5': - constraints: mem=3072M - '6': - '7': - '8': - '9': - '10': - '11': - '12': - '13': - '14': - '15': - '16': - '17': - '18': - '19': - '20': - '21': - -applications: - - keystone-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router - glance-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router - nova-cloud-controller-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router - cinder-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router - placement-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router - - mysql-innodb-cluster: - charm: cs:~openstack-charmers-next/mysql-innodb-cluster - num_units: 3 - options: - source: *openstack-origin - to: - - '0' - - '1' - - '2' - - ceph-mon: - charm: cs:~openstack-charmers-next/ceph-mon - num_units: 3 - options: - source: *openstack-origin - monitor-count: '3' - to: - - '6' - - '7' - - '8' - - ceph-osd: - charm: cs:~openstack-charmers-next/ceph-osd - num_units: 3 - storage: - osd-devices: 'cinder,10G' - options: - source: *openstack-origin - osd-devices: '/dev/test-non-existent' - to: - - '9' - - '10' - - '11' - - cinder: - charm: cs:~openstack-charmers-next/cinder - num_units: 1 - options: - block-device: None - openstack-origin: *openstack-origin - glance-api-version: 2 - to: - - '12' - - cinder-ceph: - charm: cs:~openstack-charmers-next/cinder-ceph - num_units: 0 - - cinder-backup-swift-proxy: - charm: cinder-backup-swift-proxy - num_units: 0 - options: - auth-version: 3 - swift-user: admin - swift-key: openstack - user-domain: admin_domain - project-domain: admin_domain - project-name: admin - - glance: - charm: cs:~openstack-charmers-next/glance - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '13' - - keystone: - charm: cs:~openstack-charmers-next/keystone - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '14' - - nova-cloud-controller: - charm: cs:~openstack-charmers-next/nova-cloud-controller - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '15' - - rabbitmq-server: - charm: cs:~openstack-charmers-next/rabbitmq-server - num_units: 1 - options: - source: *openstack-origin - to: - - '16' - - nova-compute: - charm: cs:~openstack-charmers-next/nova-compute - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '17' - - placement: - charm: cs:~openstack-charmers-next/placement - num_units: 1 - constraints: mem=1G - options: - openstack-origin: *openstack-origin - to: - - '18' - -# external swift - swift-keystone-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router - - swift-mysql-innodb-cluster: - charm: cs:~openstack-charmers-next/mysql-innodb-cluster - num_units: 3 - options: - source: *openstack-origin - to: - - '3' - - '4' - - '5' - - swift-keystone: - charm: cs:~openstack-charmers-next/keystone - num_units: 1 - options: - openstack-origin: *openstack-origin - admin-password: openstack - preferred-api-version: 3 - to: - - '19' - - - swift-proxy: - charm: cs:~openstack-charmers-next/swift-proxy - num_units: 1 - options: - openstack-origin: *openstack-origin - zone-assignment: manual - replicas: 1 - to: - - '20' - - swift-storage: - charm: cs:~openstack-charmers-next/swift-storage - num_units: 1 - options: - openstack-origin: *openstack-origin - zone: 1 - storage: - block-devices: 'cinder,10G' - to: - - '21' - - -relations: - - - - 'nova-compute:amqp' - - 'rabbitmq-server:amqp' - - - - 'keystone:shared-db' - - 'keystone-mysql-router:shared-db' - - - 'keystone-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - - 'nova-cloud-controller:identity-service' - - 'keystone:identity-service' - - - - 'glance:identity-service' - - 'keystone:identity-service' - - - - 'glance:shared-db' - - 'glance-mysql-router:shared-db' - - - 'glance-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - - 'glance:amqp' - - 'rabbitmq-server:amqp' - - - - 'nova-cloud-controller:image-service' - - 'glance:image-service' - - - - 'nova-compute:image-service' - - 'glance:image-service' - - - - 'nova-cloud-controller:cloud-compute' - - 'nova-compute:cloud-compute' - - - - 'nova-cloud-controller:amqp' - - 'rabbitmq-server:amqp' - - - - 'nova-cloud-controller:shared-db' - - 'nova-cloud-controller-mysql-router:shared-db' - - - 'nova-cloud-controller-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - - 'placement:shared-db' - - 'placement-mysql-router:shared-db' - - - 'placement-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - - 'placement:identity-service' - - 'keystone:identity-service' - - - - 'placement:placement' - - 'nova-cloud-controller:placement' - - - - 'cinder:image-service' - - 'glance:image-service' - - - - 'cinder:amqp' - - 'rabbitmq-server:amqp' - - - - 'cinder:identity-service' - - 'keystone:identity-service' - - - - 'cinder:cinder-volume-service' - - 'nova-cloud-controller:cinder-volume-service' - - - - 'cinder-ceph:storage-backend' - - 'cinder:storage-backend' - - - - 'cinder' - - 'cinder-backup-swift-proxy' - - - - 'ceph-mon:client' - - 'nova-compute:ceph' - - - - 'nova-compute:ceph-access' - - 'cinder-ceph:ceph-access' - - - - 'cinder:shared-db' - - 'cinder-mysql-router:shared-db' - - - 'cinder-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - - 'ceph-mon:client' - - 'cinder-ceph:ceph' - - - - 'ceph-mon:client' - - 'glance:ceph' - - - - 'ceph-osd:mon' - - 'ceph-mon:osd' - -# external swift service - - - 'swift-keystone:shared-db' - - 'swift-keystone-mysql-router:shared-db' - - - 'swift-keystone-mysql-router:db-router' - - 'swift-mysql-innodb-cluster:db-router' - - - - 'swift-proxy:identity-service' - - 'swift-keystone:identity-service' - - - - 'swift-proxy:swift-storage' - - 'swift-storage:swift-storage' - diff --git a/src/tests/bundles/focal-victoria.yaml b/src/tests/bundles/focal-victoria.yaml deleted file mode 100644 index 5fa2e89..0000000 --- a/src/tests/bundles/focal-victoria.yaml +++ /dev/null @@ -1,307 +0,0 @@ -variables: - openstack-origin: &openstack-origin cloud:focal-victoria - -series: focal - -comment: -- 'machines section to decide order of deployment. database sooner = faster' -machines: - '0': - constraints: mem=3072M - '1': - constraints: mem=3072M - '2': - constraints: mem=3072M - '3': - constraints: mem=3072M - '4': - constraints: mem=3072M - '5': - constraints: mem=3072M - '6': - '7': - '8': - '9': - '10': - '11': - '12': - '13': - '14': - '15': - '16': - '17': - '18': - '19': - '20': - '21': - -applications: - - keystone-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router - glance-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router - nova-cloud-controller-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router - cinder-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router - placement-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router - - mysql-innodb-cluster: - charm: cs:~openstack-charmers-next/mysql-innodb-cluster - num_units: 3 - options: - source: *openstack-origin - to: - - '0' - - '1' - - '2' - - ceph-mon: - charm: cs:~openstack-charmers-next/ceph-mon - num_units: 3 - options: - source: *openstack-origin - monitor-count: '3' - to: - - '6' - - '7' - - '8' - - ceph-osd: - charm: cs:~openstack-charmers-next/ceph-osd - num_units: 3 - storage: - osd-devices: 'cinder,10G' - options: - source: *openstack-origin - osd-devices: '/dev/test-non-existent' - to: - - '9' - - '10' - - '11' - - cinder: - charm: cs:~openstack-charmers-next/cinder - num_units: 1 - options: - block-device: None - openstack-origin: *openstack-origin - glance-api-version: 2 - to: - - '12' - - cinder-ceph: - charm: cs:~openstack-charmers-next/cinder-ceph - num_units: 0 - - cinder-backup-swift-proxy: - charm: cinder-backup-swift-proxy - num_units: 0 - options: - auth-version: 3 - swift-user: admin - swift-key: openstack - user-domain: admin_domain - project-domain: admin_domain - project-name: admin - - glance: - charm: cs:~openstack-charmers-next/glance - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '13' - - keystone: - charm: cs:~openstack-charmers-next/keystone - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '14' - - nova-cloud-controller: - charm: cs:~openstack-charmers-next/nova-cloud-controller - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '15' - - rabbitmq-server: - charm: cs:~openstack-charmers-next/rabbitmq-server - num_units: 1 - options: - source: *openstack-origin - to: - - '16' - - nova-compute: - charm: cs:~openstack-charmers-next/nova-compute - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '17' - - placement: - charm: cs:~openstack-charmers-next/placement - num_units: 1 - constraints: mem=1G - options: - openstack-origin: *openstack-origin - to: - - '18' - -# external swift - swift-keystone-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router - - swift-mysql-innodb-cluster: - charm: cs:~openstack-charmers-next/mysql-innodb-cluster - num_units: 3 - options: - source: *openstack-origin - to: - - '3' - - '4' - - '5' - - swift-keystone: - charm: cs:~openstack-charmers-next/keystone - num_units: 1 - options: - openstack-origin: *openstack-origin - admin-password: openstack - preferred-api-version: 3 - to: - - '19' - - - swift-proxy: - charm: cs:~openstack-charmers-next/swift-proxy - num_units: 1 - options: - openstack-origin: *openstack-origin - zone-assignment: manual - replicas: 1 - to: - - '20' - - swift-storage: - charm: cs:~openstack-charmers-next/swift-storage - num_units: 1 - options: - openstack-origin: *openstack-origin - zone: 1 - storage: - block-devices: 'cinder,10G' - to: - - '21' - - -relations: - - - - 'nova-compute:amqp' - - 'rabbitmq-server:amqp' - - - - 'keystone:shared-db' - - 'keystone-mysql-router:shared-db' - - - 'keystone-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - - 'nova-cloud-controller:identity-service' - - 'keystone:identity-service' - - - - 'glance:identity-service' - - 'keystone:identity-service' - - - - 'glance:shared-db' - - 'glance-mysql-router:shared-db' - - - 'glance-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - - 'glance:amqp' - - 'rabbitmq-server:amqp' - - - - 'nova-cloud-controller:image-service' - - 'glance:image-service' - - - - 'nova-compute:image-service' - - 'glance:image-service' - - - - 'nova-cloud-controller:cloud-compute' - - 'nova-compute:cloud-compute' - - - - 'nova-cloud-controller:amqp' - - 'rabbitmq-server:amqp' - - - - 'nova-cloud-controller:shared-db' - - 'nova-cloud-controller-mysql-router:shared-db' - - - 'nova-cloud-controller-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - - 'placement:shared-db' - - 'placement-mysql-router:shared-db' - - - 'placement-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - - 'placement:identity-service' - - 'keystone:identity-service' - - - - 'placement:placement' - - 'nova-cloud-controller:placement' - - - - 'cinder:image-service' - - 'glance:image-service' - - - - 'cinder:amqp' - - 'rabbitmq-server:amqp' - - - - 'cinder:identity-service' - - 'keystone:identity-service' - - - - 'cinder:cinder-volume-service' - - 'nova-cloud-controller:cinder-volume-service' - - - - 'cinder-ceph:storage-backend' - - 'cinder:storage-backend' - - - - 'cinder' - - 'cinder-backup-swift-proxy' - - - - 'ceph-mon:client' - - 'nova-compute:ceph' - - - - 'nova-compute:ceph-access' - - 'cinder-ceph:ceph-access' - - - - 'cinder:shared-db' - - 'cinder-mysql-router:shared-db' - - - 'cinder-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - - 'ceph-mon:client' - - 'cinder-ceph:ceph' - - - - 'ceph-mon:client' - - 'glance:ceph' - - - - 'ceph-osd:mon' - - 'ceph-mon:osd' - -# external swift service - - - 'swift-keystone:shared-db' - - 'swift-keystone-mysql-router:shared-db' - - - 'swift-keystone-mysql-router:db-router' - - 'swift-mysql-innodb-cluster:db-router' - - - - 'swift-proxy:identity-service' - - 'swift-keystone:identity-service' - - - - 'swift-proxy:swift-storage' - - 'swift-storage:swift-storage' - diff --git a/src/tests/bundles/focal-wallaby.yaml b/src/tests/bundles/focal-wallaby.yaml deleted file mode 100644 index 6e07d14..0000000 --- a/src/tests/bundles/focal-wallaby.yaml +++ /dev/null @@ -1,307 +0,0 @@ -variables: - openstack-origin: &openstack-origin cloud:focal-wallaby - -series: focal - -comment: -- 'machines section to decide order of deployment. database sooner = faster' -machines: - '0': - constraints: mem=3072M - '1': - constraints: mem=3072M - '2': - constraints: mem=3072M - '3': - constraints: mem=3072M - '4': - constraints: mem=3072M - '5': - constraints: mem=3072M - '6': - '7': - '8': - '9': - '10': - '11': - '12': - '13': - '14': - '15': - '16': - '17': - '18': - '19': - '20': - '21': - -applications: - - keystone-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router - glance-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router - nova-cloud-controller-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router - cinder-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router - placement-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router - - mysql-innodb-cluster: - charm: cs:~openstack-charmers-next/mysql-innodb-cluster - num_units: 3 - options: - source: *openstack-origin - to: - - '0' - - '1' - - '2' - - ceph-mon: - charm: cs:~openstack-charmers-next/ceph-mon - num_units: 3 - options: - source: *openstack-origin - monitor-count: '3' - to: - - '6' - - '7' - - '8' - - ceph-osd: - charm: cs:~openstack-charmers-next/ceph-osd - num_units: 3 - storage: - osd-devices: 'cinder,10G' - options: - source: *openstack-origin - osd-devices: '/dev/test-non-existent' - to: - - '9' - - '10' - - '11' - - cinder: - charm: cs:~openstack-charmers-next/cinder - num_units: 1 - options: - block-device: None - openstack-origin: *openstack-origin - glance-api-version: 2 - to: - - '12' - - cinder-ceph: - charm: cs:~openstack-charmers-next/cinder-ceph - num_units: 0 - - cinder-backup-swift-proxy: - charm: cinder-backup-swift-proxy - num_units: 0 - options: - auth-version: 3 - swift-user: admin - swift-key: openstack - user-domain: admin_domain - project-domain: admin_domain - project-name: admin - - glance: - charm: cs:~openstack-charmers-next/glance - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '13' - - keystone: - charm: cs:~openstack-charmers-next/keystone - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '14' - - nova-cloud-controller: - charm: cs:~openstack-charmers-next/nova-cloud-controller - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '15' - - rabbitmq-server: - charm: cs:~openstack-charmers-next/rabbitmq-server - num_units: 1 - options: - source: *openstack-origin - to: - - '16' - - nova-compute: - charm: cs:~openstack-charmers-next/nova-compute - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '17' - - placement: - charm: cs:~openstack-charmers-next/placement - num_units: 1 - constraints: mem=1G - options: - openstack-origin: *openstack-origin - to: - - '18' - -# external swift - swift-keystone-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router - - swift-mysql-innodb-cluster: - charm: cs:~openstack-charmers-next/mysql-innodb-cluster - num_units: 3 - options: - source: *openstack-origin - to: - - '3' - - '4' - - '5' - - swift-keystone: - charm: cs:~openstack-charmers-next/keystone - num_units: 1 - options: - openstack-origin: *openstack-origin - admin-password: openstack - preferred-api-version: 3 - to: - - '19' - - - swift-proxy: - charm: cs:~openstack-charmers-next/swift-proxy - num_units: 1 - options: - openstack-origin: *openstack-origin - zone-assignment: manual - replicas: 1 - to: - - '20' - - swift-storage: - charm: cs:~openstack-charmers-next/swift-storage - num_units: 1 - options: - openstack-origin: *openstack-origin - zone: 1 - storage: - block-devices: 'cinder,10G' - to: - - '21' - - -relations: - - - - 'nova-compute:amqp' - - 'rabbitmq-server:amqp' - - - - 'keystone:shared-db' - - 'keystone-mysql-router:shared-db' - - - 'keystone-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - - 'nova-cloud-controller:identity-service' - - 'keystone:identity-service' - - - - 'glance:identity-service' - - 'keystone:identity-service' - - - - 'glance:shared-db' - - 'glance-mysql-router:shared-db' - - - 'glance-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - - 'glance:amqp' - - 'rabbitmq-server:amqp' - - - - 'nova-cloud-controller:image-service' - - 'glance:image-service' - - - - 'nova-compute:image-service' - - 'glance:image-service' - - - - 'nova-cloud-controller:cloud-compute' - - 'nova-compute:cloud-compute' - - - - 'nova-cloud-controller:amqp' - - 'rabbitmq-server:amqp' - - - - 'nova-cloud-controller:shared-db' - - 'nova-cloud-controller-mysql-router:shared-db' - - - 'nova-cloud-controller-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - - 'placement:shared-db' - - 'placement-mysql-router:shared-db' - - - 'placement-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - - 'placement:identity-service' - - 'keystone:identity-service' - - - - 'placement:placement' - - 'nova-cloud-controller:placement' - - - - 'cinder:image-service' - - 'glance:image-service' - - - - 'cinder:amqp' - - 'rabbitmq-server:amqp' - - - - 'cinder:identity-service' - - 'keystone:identity-service' - - - - 'cinder:cinder-volume-service' - - 'nova-cloud-controller:cinder-volume-service' - - - - 'cinder-ceph:storage-backend' - - 'cinder:storage-backend' - - - - 'cinder' - - 'cinder-backup-swift-proxy' - - - - 'ceph-mon:client' - - 'nova-compute:ceph' - - - - 'nova-compute:ceph-access' - - 'cinder-ceph:ceph-access' - - - - 'cinder:shared-db' - - 'cinder-mysql-router:shared-db' - - - 'cinder-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - - 'ceph-mon:client' - - 'cinder-ceph:ceph' - - - - 'ceph-mon:client' - - 'glance:ceph' - - - - 'ceph-osd:mon' - - 'ceph-mon:osd' - -# external swift service - - - 'swift-keystone:shared-db' - - 'swift-keystone-mysql-router:shared-db' - - - 'swift-keystone-mysql-router:db-router' - - 'swift-mysql-innodb-cluster:db-router' - - - - 'swift-proxy:identity-service' - - 'swift-keystone:identity-service' - - - - 'swift-proxy:swift-storage' - - 'swift-storage:swift-storage' - diff --git a/src/tests/bundles/focal-xena.yaml b/src/tests/bundles/focal-xena.yaml index bd49a72..dcafb51 100644 --- a/src/tests/bundles/focal-xena.yaml +++ b/src/tests/bundles/focal-xena.yaml @@ -38,18 +38,23 @@ machines: applications: keystone-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: ch:mysql-router + channel: latest/edge glance-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: ch:mysql-router + channel: latest/edge nova-cloud-controller-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: ch:mysql-router + channel: latest/edge cinder-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: ch:mysql-router + channel: latest/edge placement-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: ch:mysql-router + channel: latest/edge mysql-innodb-cluster: - charm: cs:~openstack-charmers-next/mysql-innodb-cluster + charm: ch:mysql-innodb-cluster num_units: 3 options: source: *openstack-origin @@ -57,9 +62,10 @@ applications: - '0' - '1' - '2' + channel: latest/edge ceph-mon: - charm: cs:~openstack-charmers-next/ceph-mon + charm: ch:ceph-mon num_units: 3 options: source: *openstack-origin @@ -68,9 +74,10 @@ applications: - '6' - '7' - '8' + channel: latest/edge ceph-osd: - charm: cs:~openstack-charmers-next/ceph-osd + charm: ch:ceph-osd num_units: 3 storage: osd-devices: 'cinder,10G' @@ -81,9 +88,10 @@ applications: - '9' - '10' - '11' + channel: latest/edge cinder: - charm: cs:~openstack-charmers-next/cinder + charm: ch:cinder num_units: 1 options: block-device: None @@ -91,10 +99,12 @@ applications: glance-api-version: 2 to: - '12' + channel: latest/edge cinder-ceph: - charm: cs:~openstack-charmers-next/cinder-ceph + charm: ch:cinder-ceph num_units: 0 + channel: latest/edge cinder-backup-swift-proxy: charm: cinder-backup-swift-proxy @@ -108,60 +118,67 @@ applications: project-name: admin glance: - charm: cs:~openstack-charmers-next/glance + charm: ch:glance num_units: 1 options: openstack-origin: *openstack-origin to: - '13' + channel: latest/edge keystone: - charm: cs:~openstack-charmers-next/keystone + charm: ch:keystone num_units: 1 options: openstack-origin: *openstack-origin to: - '14' + channel: latest/edge nova-cloud-controller: - charm: cs:~openstack-charmers-next/nova-cloud-controller + charm: ch:nova-cloud-controller num_units: 1 options: openstack-origin: *openstack-origin to: - '15' + channel: latest/edge rabbitmq-server: - charm: cs:~openstack-charmers-next/rabbitmq-server + charm: ch:rabbitmq-server num_units: 1 options: source: *openstack-origin to: - '16' + channel: latest/edge nova-compute: - charm: cs:~openstack-charmers-next/nova-compute + charm: ch:nova-compute num_units: 1 options: openstack-origin: *openstack-origin to: - '17' + channel: latest/edge placement: - charm: cs:~openstack-charmers-next/placement + charm: ch:placement num_units: 1 constraints: mem=1G options: openstack-origin: *openstack-origin to: - '18' + channel: latest/edge # external swift swift-keystone-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: ch:mysql-router + channel: latest/edge swift-mysql-innodb-cluster: - charm: cs:~openstack-charmers-next/mysql-innodb-cluster + charm: ch:mysql-innodb-cluster num_units: 3 options: source: *openstack-origin @@ -169,9 +186,10 @@ applications: - '3' - '4' - '5' + channel: latest/edge swift-keystone: - charm: cs:~openstack-charmers-next/keystone + charm: ch:keystone num_units: 1 options: openstack-origin: *openstack-origin @@ -179,10 +197,11 @@ applications: preferred-api-version: 3 to: - '19' + channel: latest/edge swift-proxy: - charm: cs:~openstack-charmers-next/swift-proxy + charm: ch:swift-proxy num_units: 1 options: openstack-origin: *openstack-origin @@ -190,9 +209,10 @@ applications: replicas: 1 to: - '20' + channel: latest/edge swift-storage: - charm: cs:~openstack-charmers-next/swift-storage + charm: ch:swift-storage num_units: 1 options: openstack-origin: *openstack-origin @@ -201,6 +221,7 @@ applications: block-devices: 'cinder,10G' to: - '21' + channel: latest/edge relations: diff --git a/src/tests/bundles/focal-yoga.yaml b/src/tests/bundles/focal-yoga.yaml index 0443d08..5e359bd 100644 --- a/src/tests/bundles/focal-yoga.yaml +++ b/src/tests/bundles/focal-yoga.yaml @@ -38,18 +38,23 @@ machines: applications: keystone-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: ch:mysql-router + channel: latest/edge glance-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: ch:mysql-router + channel: latest/edge nova-cloud-controller-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: ch:mysql-router + channel: latest/edge cinder-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: ch:mysql-router + channel: latest/edge placement-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: ch:mysql-router + channel: latest/edge mysql-innodb-cluster: - charm: cs:~openstack-charmers-next/mysql-innodb-cluster + charm: ch:mysql-innodb-cluster num_units: 3 options: source: *openstack-origin @@ -57,9 +62,10 @@ applications: - '0' - '1' - '2' + channel: latest/edge ceph-mon: - charm: cs:~openstack-charmers-next/ceph-mon + charm: ch:ceph-mon num_units: 3 options: source: *openstack-origin @@ -68,9 +74,10 @@ applications: - '6' - '7' - '8' + channel: latest/edge ceph-osd: - charm: cs:~openstack-charmers-next/ceph-osd + charm: ch:ceph-osd num_units: 3 storage: osd-devices: 'cinder,10G' @@ -81,9 +88,10 @@ applications: - '9' - '10' - '11' + channel: latest/edge cinder: - charm: cs:~openstack-charmers-next/cinder + charm: ch:cinder num_units: 1 options: block-device: None @@ -91,10 +99,12 @@ applications: glance-api-version: 2 to: - '12' + channel: latest/edge cinder-ceph: - charm: cs:~openstack-charmers-next/cinder-ceph + charm: ch:cinder-ceph num_units: 0 + channel: latest/edge cinder-backup-swift-proxy: charm: cinder-backup-swift-proxy @@ -108,60 +118,67 @@ applications: project-name: admin glance: - charm: cs:~openstack-charmers-next/glance + charm: ch:glance num_units: 1 options: openstack-origin: *openstack-origin to: - '13' + channel: latest/edge keystone: - charm: cs:~openstack-charmers-next/keystone + charm: ch:keystone num_units: 1 options: openstack-origin: *openstack-origin to: - '14' + channel: latest/edge nova-cloud-controller: - charm: cs:~openstack-charmers-next/nova-cloud-controller + charm: ch:nova-cloud-controller num_units: 1 options: openstack-origin: *openstack-origin to: - '15' + channel: latest/edge rabbitmq-server: - charm: cs:~openstack-charmers-next/rabbitmq-server + charm: ch:rabbitmq-server num_units: 1 options: source: *openstack-origin to: - '16' + channel: latest/edge nova-compute: - charm: cs:~openstack-charmers-next/nova-compute + charm: ch:nova-compute num_units: 1 options: openstack-origin: *openstack-origin to: - '17' + channel: latest/edge placement: - charm: cs:~openstack-charmers-next/placement + charm: ch:placement num_units: 1 constraints: mem=1G options: openstack-origin: *openstack-origin to: - '18' + channel: latest/edge # external swift swift-keystone-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: ch:mysql-router + channel: latest/edge swift-mysql-innodb-cluster: - charm: cs:~openstack-charmers-next/mysql-innodb-cluster + charm: ch:mysql-innodb-cluster num_units: 3 options: source: *openstack-origin @@ -169,9 +186,10 @@ applications: - '3' - '4' - '5' + channel: latest/edge swift-keystone: - charm: cs:~openstack-charmers-next/keystone + charm: ch:keystone num_units: 1 options: openstack-origin: *openstack-origin @@ -179,10 +197,11 @@ applications: preferred-api-version: 3 to: - '19' + channel: latest/edge swift-proxy: - charm: cs:~openstack-charmers-next/swift-proxy + charm: ch:swift-proxy num_units: 1 options: openstack-origin: *openstack-origin @@ -190,9 +209,10 @@ applications: replicas: 1 to: - '20' + channel: latest/edge swift-storage: - charm: cs:~openstack-charmers-next/swift-storage + charm: ch:swift-storage num_units: 1 options: openstack-origin: *openstack-origin @@ -201,6 +221,7 @@ applications: block-devices: 'cinder,10G' to: - '21' + channel: latest/edge relations: diff --git a/src/tests/bundles/hirsute-wallaby.yaml b/src/tests/bundles/hirsute-wallaby.yaml deleted file mode 100644 index ceb2baf..0000000 --- a/src/tests/bundles/hirsute-wallaby.yaml +++ /dev/null @@ -1,307 +0,0 @@ -variables: - openstack-origin: &openstack-origin distro - -series: hirsute - -comment: -- 'machines section to decide order of deployment. database sooner = faster' -machines: - '0': - constraints: mem=3072M - '1': - constraints: mem=3072M - '2': - constraints: mem=3072M - '3': - constraints: mem=3072M - '4': - constraints: mem=3072M - '5': - constraints: mem=3072M - '6': - '7': - '8': - '9': - '10': - '11': - '12': - '13': - '14': - '15': - '16': - '17': - '18': - '19': - '20': - '21': - -applications: - - keystone-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router - glance-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router - nova-cloud-controller-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router - cinder-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router - placement-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router - - mysql-innodb-cluster: - charm: cs:~openstack-charmers-next/mysql-innodb-cluster - num_units: 3 - options: - source: *openstack-origin - to: - - '0' - - '1' - - '2' - - ceph-mon: - charm: cs:~openstack-charmers-next/ceph-mon - num_units: 3 - options: - source: *openstack-origin - monitor-count: '3' - to: - - '6' - - '7' - - '8' - - ceph-osd: - charm: cs:~openstack-charmers-next/ceph-osd - num_units: 3 - storage: - osd-devices: 'cinder,10G' - options: - source: *openstack-origin - osd-devices: '/dev/test-non-existent' - to: - - '9' - - '10' - - '11' - - cinder: - charm: cs:~openstack-charmers-next/cinder - num_units: 1 - options: - block-device: None - openstack-origin: *openstack-origin - glance-api-version: 2 - to: - - '12' - - cinder-ceph: - charm: cs:~openstack-charmers-next/cinder-ceph - num_units: 0 - - cinder-backup-swift-proxy: - charm: cinder-backup-swift-proxy - num_units: 0 - options: - auth-version: 3 - swift-user: admin - swift-key: openstack - user-domain: admin_domain - project-domain: admin_domain - project-name: admin - - glance: - charm: cs:~openstack-charmers-next/glance - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '13' - - keystone: - charm: cs:~openstack-charmers-next/keystone - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '14' - - nova-cloud-controller: - charm: cs:~openstack-charmers-next/nova-cloud-controller - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '15' - - rabbitmq-server: - charm: cs:~openstack-charmers-next/rabbitmq-server - num_units: 1 - options: - source: *openstack-origin - to: - - '16' - - nova-compute: - charm: cs:~openstack-charmers-next/nova-compute - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '17' - - placement: - charm: cs:~openstack-charmers-next/placement - num_units: 1 - constraints: mem=1G - options: - openstack-origin: *openstack-origin - to: - - '18' - -# external swift - swift-keystone-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router - - swift-mysql-innodb-cluster: - charm: cs:~openstack-charmers-next/mysql-innodb-cluster - num_units: 3 - options: - source: *openstack-origin - to: - - '3' - - '4' - - '5' - - swift-keystone: - charm: cs:~openstack-charmers-next/keystone - num_units: 1 - options: - openstack-origin: *openstack-origin - admin-password: openstack - preferred-api-version: 3 - to: - - '19' - - - swift-proxy: - charm: cs:~openstack-charmers-next/swift-proxy - num_units: 1 - options: - openstack-origin: *openstack-origin - zone-assignment: manual - replicas: 1 - to: - - '20' - - swift-storage: - charm: cs:~openstack-charmers-next/swift-storage - num_units: 1 - options: - openstack-origin: *openstack-origin - zone: 1 - storage: - block-devices: 'cinder,10G' - to: - - '21' - - -relations: - - - - 'nova-compute:amqp' - - 'rabbitmq-server:amqp' - - - - 'keystone:shared-db' - - 'keystone-mysql-router:shared-db' - - - 'keystone-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - - 'nova-cloud-controller:identity-service' - - 'keystone:identity-service' - - - - 'glance:identity-service' - - 'keystone:identity-service' - - - - 'glance:shared-db' - - 'glance-mysql-router:shared-db' - - - 'glance-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - - 'glance:amqp' - - 'rabbitmq-server:amqp' - - - - 'nova-cloud-controller:image-service' - - 'glance:image-service' - - - - 'nova-compute:image-service' - - 'glance:image-service' - - - - 'nova-cloud-controller:cloud-compute' - - 'nova-compute:cloud-compute' - - - - 'nova-cloud-controller:amqp' - - 'rabbitmq-server:amqp' - - - - 'nova-cloud-controller:shared-db' - - 'nova-cloud-controller-mysql-router:shared-db' - - - 'nova-cloud-controller-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - - 'placement:shared-db' - - 'placement-mysql-router:shared-db' - - - 'placement-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - - 'placement:identity-service' - - 'keystone:identity-service' - - - - 'placement:placement' - - 'nova-cloud-controller:placement' - - - - 'cinder:image-service' - - 'glance:image-service' - - - - 'cinder:amqp' - - 'rabbitmq-server:amqp' - - - - 'cinder:identity-service' - - 'keystone:identity-service' - - - - 'cinder:cinder-volume-service' - - 'nova-cloud-controller:cinder-volume-service' - - - - 'cinder-ceph:storage-backend' - - 'cinder:storage-backend' - - - - 'cinder' - - 'cinder-backup-swift-proxy' - - - - 'ceph-mon:client' - - 'nova-compute:ceph' - - - - 'nova-compute:ceph-access' - - 'cinder-ceph:ceph-access' - - - - 'cinder:shared-db' - - 'cinder-mysql-router:shared-db' - - - 'cinder-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - - 'ceph-mon:client' - - 'cinder-ceph:ceph' - - - - 'ceph-mon:client' - - 'glance:ceph' - - - - 'ceph-osd:mon' - - 'ceph-mon:osd' - -# external swift service - - - 'swift-keystone:shared-db' - - 'swift-keystone-mysql-router:shared-db' - - - 'swift-keystone-mysql-router:db-router' - - 'swift-mysql-innodb-cluster:db-router' - - - - 'swift-proxy:identity-service' - - 'swift-keystone:identity-service' - - - - 'swift-proxy:swift-storage' - - 'swift-storage:swift-storage' - diff --git a/src/tests/bundles/impish-xena.yaml b/src/tests/bundles/impish-xena.yaml index 339256f..6aed27d 100644 --- a/src/tests/bundles/impish-xena.yaml +++ b/src/tests/bundles/impish-xena.yaml @@ -38,18 +38,23 @@ machines: applications: keystone-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: ch:mysql-router + channel: latest/edge glance-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: ch:mysql-router + channel: latest/edge nova-cloud-controller-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: ch:mysql-router + channel: latest/edge cinder-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: ch:mysql-router + channel: latest/edge placement-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: ch:mysql-router + channel: latest/edge mysql-innodb-cluster: - charm: cs:~openstack-charmers-next/mysql-innodb-cluster + charm: ch:mysql-innodb-cluster num_units: 3 options: source: *openstack-origin @@ -57,9 +62,10 @@ applications: - '0' - '1' - '2' + channel: latest/edge ceph-mon: - charm: cs:~openstack-charmers-next/ceph-mon + charm: ch:ceph-mon num_units: 3 options: source: *openstack-origin @@ -68,9 +74,10 @@ applications: - '6' - '7' - '8' + channel: latest/edge ceph-osd: - charm: cs:~openstack-charmers-next/ceph-osd + charm: ch:ceph-osd num_units: 3 storage: osd-devices: 'cinder,10G' @@ -81,9 +88,10 @@ applications: - '9' - '10' - '11' + channel: latest/edge cinder: - charm: cs:~openstack-charmers-next/cinder + charm: ch:cinder num_units: 1 options: block-device: None @@ -91,10 +99,12 @@ applications: glance-api-version: 2 to: - '12' + channel: latest/edge cinder-ceph: - charm: cs:~openstack-charmers-next/cinder-ceph + charm: ch:cinder-ceph num_units: 0 + channel: latest/edge cinder-backup-swift-proxy: charm: cinder-backup-swift-proxy @@ -108,60 +118,67 @@ applications: project-name: admin glance: - charm: cs:~openstack-charmers-next/glance + charm: ch:glance num_units: 1 options: openstack-origin: *openstack-origin to: - '13' + channel: latest/edge keystone: - charm: cs:~openstack-charmers-next/keystone + charm: ch:keystone num_units: 1 options: openstack-origin: *openstack-origin to: - '14' + channel: latest/edge nova-cloud-controller: - charm: cs:~openstack-charmers-next/nova-cloud-controller + charm: ch:nova-cloud-controller num_units: 1 options: openstack-origin: *openstack-origin to: - '15' + channel: latest/edge rabbitmq-server: - charm: cs:~openstack-charmers-next/rabbitmq-server + charm: ch:rabbitmq-server num_units: 1 options: source: *openstack-origin to: - '16' + channel: latest/edge nova-compute: - charm: cs:~openstack-charmers-next/nova-compute + charm: ch:nova-compute num_units: 1 options: openstack-origin: *openstack-origin to: - '17' + channel: latest/edge placement: - charm: cs:~openstack-charmers-next/placement + charm: ch:placement num_units: 1 constraints: mem=1G options: openstack-origin: *openstack-origin to: - '18' + channel: latest/edge # external swift swift-keystone-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: ch:mysql-router + channel: latest/edge swift-mysql-innodb-cluster: - charm: cs:~openstack-charmers-next/mysql-innodb-cluster + charm: ch:mysql-innodb-cluster num_units: 3 options: source: *openstack-origin @@ -169,9 +186,10 @@ applications: - '3' - '4' - '5' + channel: latest/edge swift-keystone: - charm: cs:~openstack-charmers-next/keystone + charm: ch:keystone num_units: 1 options: openstack-origin: *openstack-origin @@ -179,10 +197,11 @@ applications: preferred-api-version: 3 to: - '19' + channel: latest/edge swift-proxy: - charm: cs:~openstack-charmers-next/swift-proxy + charm: ch:swift-proxy num_units: 1 options: openstack-origin: *openstack-origin @@ -190,9 +209,10 @@ applications: replicas: 1 to: - '20' + channel: latest/edge swift-storage: - charm: cs:~openstack-charmers-next/swift-storage + charm: ch:swift-storage num_units: 1 options: openstack-origin: *openstack-origin @@ -201,6 +221,7 @@ applications: block-devices: 'cinder,10G' to: - '21' + channel: latest/edge relations: diff --git a/src/tests/bundles/jammy-yoga.yaml b/src/tests/bundles/jammy-yoga.yaml index 92e91a7..4eae7c7 100644 --- a/src/tests/bundles/jammy-yoga.yaml +++ b/src/tests/bundles/jammy-yoga.yaml @@ -38,18 +38,23 @@ machines: applications: keystone-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: ch:mysql-router + channel: latest/edge glance-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: ch:mysql-router + channel: latest/edge nova-cloud-controller-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: ch:mysql-router + channel: latest/edge cinder-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: ch:mysql-router + channel: latest/edge placement-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: ch:mysql-router + channel: latest/edge mysql-innodb-cluster: - charm: cs:~openstack-charmers-next/mysql-innodb-cluster + charm: ch:mysql-innodb-cluster num_units: 3 options: source: *openstack-origin @@ -57,9 +62,10 @@ applications: - '0' - '1' - '2' + channel: latest/edge ceph-mon: - charm: cs:~openstack-charmers-next/ceph-mon + charm: ch:ceph-mon num_units: 3 options: source: *openstack-origin @@ -68,9 +74,10 @@ applications: - '6' - '7' - '8' + channel: latest/edge ceph-osd: - charm: cs:~openstack-charmers-next/ceph-osd + charm: ch:ceph-osd num_units: 3 storage: osd-devices: 'cinder,10G' @@ -81,9 +88,10 @@ applications: - '9' - '10' - '11' + channel: latest/edge cinder: - charm: cs:~openstack-charmers-next/cinder + charm: ch:cinder num_units: 1 options: block-device: None @@ -91,10 +99,12 @@ applications: glance-api-version: 2 to: - '12' + channel: latest/edge cinder-ceph: - charm: cs:~openstack-charmers-next/cinder-ceph + charm: ch:cinder-ceph num_units: 0 + channel: latest/edge cinder-backup-swift-proxy: charm: cinder-backup-swift-proxy @@ -108,60 +118,67 @@ applications: project-name: admin glance: - charm: cs:~openstack-charmers-next/glance + charm: ch:glance num_units: 1 options: openstack-origin: *openstack-origin to: - '13' + channel: latest/edge keystone: - charm: cs:~openstack-charmers-next/keystone + charm: ch:keystone num_units: 1 options: openstack-origin: *openstack-origin to: - '14' + channel: latest/edge nova-cloud-controller: - charm: cs:~openstack-charmers-next/nova-cloud-controller + charm: ch:nova-cloud-controller num_units: 1 options: openstack-origin: *openstack-origin to: - '15' + channel: latest/edge rabbitmq-server: - charm: cs:~openstack-charmers-next/rabbitmq-server + charm: ch:rabbitmq-server num_units: 1 options: source: *openstack-origin to: - '16' + channel: latest/edge nova-compute: - charm: cs:~openstack-charmers-next/nova-compute + charm: ch:nova-compute num_units: 1 options: openstack-origin: *openstack-origin to: - '17' + channel: latest/edge placement: - charm: cs:~openstack-charmers-next/placement + charm: ch:placement num_units: 1 constraints: mem=1G options: openstack-origin: *openstack-origin to: - '18' + channel: latest/edge # external swift swift-keystone-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: ch:mysql-router + channel: latest/edge swift-mysql-innodb-cluster: - charm: cs:~openstack-charmers-next/mysql-innodb-cluster + charm: ch:mysql-innodb-cluster num_units: 3 options: source: *openstack-origin @@ -169,9 +186,10 @@ applications: - '3' - '4' - '5' + channel: latest/edge swift-keystone: - charm: cs:~openstack-charmers-next/keystone + charm: ch:keystone num_units: 1 options: openstack-origin: *openstack-origin @@ -179,10 +197,11 @@ applications: preferred-api-version: 3 to: - '19' + channel: latest/edge swift-proxy: - charm: cs:~openstack-charmers-next/swift-proxy + charm: ch:swift-proxy num_units: 1 options: openstack-origin: *openstack-origin @@ -190,9 +209,10 @@ applications: replicas: 1 to: - '20' + channel: latest/edge swift-storage: - charm: cs:~openstack-charmers-next/swift-storage + charm: ch:swift-storage num_units: 1 options: openstack-origin: *openstack-origin @@ -201,6 +221,7 @@ applications: block-devices: 'cinder,10G' to: - '21' + channel: latest/edge relations: diff --git a/src/tests/tests.yaml b/src/tests/tests.yaml index 42e137a..0e35217 100644 --- a/src/tests/tests.yaml +++ b/src/tests/tests.yaml @@ -1,25 +1,17 @@ charm_name: cinder-backup-swift-proxy gate_bundles: - - bionic-queens-swift-v2 - - bionic-queens-swift-v3 - - focal-ussuri - - focal-victoria - - focal-wallaby - focal-xena - - hirsute-wallaby - impish-xena dev_bundles: - focal-yoga - jammy-yoga smoke_bundles: - - bionic-queens-swift-v2 - - focal-ussuri + - focal-xena configure: - zaza.openstack.charm_tests.cinder_backup_swift_proxy.setup.configure_cinder_backup tests: - zaza.openstack.charm_tests.cinder_backup_swift_proxy.tests.CinderBackupSwiftTest tests_options: force_deploy: - - hirsute-wallaby - impish-xena - jammy-yoga