diff --git a/charmcraft.yaml b/charmcraft.yaml new file mode 100644 index 0000000..ba84f31 --- /dev/null +++ b/charmcraft.yaml @@ -0,0 +1,27 @@ +type: charm + +parts: + charm: + plugin: dump + source: . + prime: + - actions/* + - files/* + - hooks/* + - lib/* + - templates/* + - actions.yaml + - config.yaml + - copyright + - hardening.yaml + - icon.svg + - LICENSE + - Makefile + - metadata.yaml + - README.md + +bases: + - name: ubuntu + channel: "20.04" + architectures: + - amd64 diff --git a/metadata.yaml b/metadata.yaml index fce447c..5086cc6 100644 --- a/metadata.yaml +++ b/metadata.yaml @@ -8,10 +8,7 @@ description: | tags: - miscellaneous series: -- bionic - focal -- groovy -- hirsute - impish subordinate: true provides: diff --git a/osci.yaml b/osci.yaml index 0b2a0aa..da6cd31 100644 --- a/osci.yaml +++ b/osci.yaml @@ -1,10 +1,6 @@ - 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 - - charm-queens-functional-jobs + - charm-yoga-functional-jobs diff --git a/tests/bundles/bionic-queens.yaml b/tests/bundles/bionic-queens.yaml deleted file mode 100644 index 48a889c..0000000 --- a/tests/bundles/bionic-queens.yaml +++ /dev/null @@ -1,77 +0,0 @@ -series: bionic -relations: -- - cinder-backup:ceph - - ceph-mon:client -- - cinder-ceph:ceph - - ceph-mon:client -- - ceph-osd:mon - - ceph-mon:osd -- - cinder:storage-backend - - cinder-ceph:storage-backend -- - cinder:backup-backend - - cinder-backup:backup-backend -- - keystone:shared-db - - percona-cluster:shared-db -- - cinder:shared-db - - percona-cluster:shared-db -- - cinder:identity-service - - keystone:identity-service -- - cinder:amqp - - rabbitmq-server:amqp -- - glance:image-service - - nova-compute:image-service -- - glance:identity-service - - keystone:identity-service -- - glance:shared-db - - percona-cluster:shared-db -- - nova-compute:ceph-access - - cinder-ceph:ceph-access -- - nova-compute:amqp - - rabbitmq-server:amqp -applications: - percona-cluster: - charm: cs:~openstack-charmers-next/percona-cluster - num_units: 1 - options: - innodb-buffer-pool-size: 256M - max-connections: 1000 - keystone: - charm: cs:~openstack-charmers-next/keystone - num_units: 1 - rabbitmq-server: - charm: cs:~openstack-charmers-next/rabbitmq-server - num_units: 1 - ceph-mon: - charm: cs:~openstack-charmers-next/ceph-mon - num_units: 3 - options: - monitor-count: '3' - auth-supported: 'none' - ceph-osd: - charm: cs:~openstack-charmers-next/ceph-osd - num_units: 3 - storage: - osd-devices: 'cinder,10G' - options: - osd-devices: '/dev/test-non-existent' - cinder: - charm: cs:~openstack-charmers-next/cinder - num_units: 1 - options: - block-device: 'None' - glance-api-version: '2' - cinder-backup: - charm: ../../../cinder-backup - series: bionic - options: - ceph-osd-replication-count: 3 - cinder-ceph: - charm: cs:~openstack-charmers-next/cinder-ceph - options: - ceph-osd-replication-count: 3 - glance: - charm: cs:~openstack-charmers-next/glance - num_units: 1 - nova-compute: - charm: cs:~openstack-charmers-next/nova-compute - num_units: 1 diff --git a/tests/bundles/bionic-rocky.yaml b/tests/bundles/bionic-rocky.yaml deleted file mode 100644 index 22bc35c..0000000 --- a/tests/bundles/bionic-rocky.yaml +++ /dev/null @@ -1,83 +0,0 @@ -series: bionic -relations: -- - cinder-backup:ceph - - ceph-mon:client -- - cinder-ceph:ceph - - ceph-mon:client -- - ceph-osd:mon - - ceph-mon:osd -- - cinder:storage-backend - - cinder-ceph:storage-backend -- - cinder:backup-backend - - cinder-backup:backup-backend -- - keystone:shared-db - - percona-cluster:shared-db -- - cinder:shared-db - - percona-cluster:shared-db -- - cinder:identity-service - - keystone:identity-service -- - cinder:amqp - - rabbitmq-server:amqp -- - glance:image-service - - nova-compute:image-service -- - glance:identity-service - - keystone:identity-service -- - glance:shared-db - - percona-cluster:shared-db -- - nova-compute:ceph-access - - cinder-ceph:ceph-access -- - nova-compute:amqp - - rabbitmq-server:amqp -applications: - percona-cluster: - charm: cs:~openstack-charmers-next/percona-cluster - num_units: 1 - options: - innodb-buffer-pool-size: 256M - max-connections: 1000 - source: cloud:bionic-rocky - keystone: - charm: cs:~openstack-charmers-next/keystone - num_units: 1 - options: - openstack-origin: cloud:bionic-rocky - rabbitmq-server: - charm: cs:~openstack-charmers-next/rabbitmq-server - num_units: 1 - ceph-mon: - charm: cs:~openstack-charmers-next/ceph-mon - num_units: 3 - options: - monitor-count: '3' - auth-supported: 'none' - source: cloud:bionic-rocky - ceph-osd: - charm: cs:~openstack-charmers-next/ceph-osd - num_units: 3 - storage: - osd-devices: 'cinder,10G' - options: - osd-devices: '/dev/test-non-existent' - source: cloud:bionic-rocky - cinder: - charm: cs:~openstack-charmers-next/cinder - num_units: 1 - options: - block-device: 'None' - glance-api-version: '2' - openstack-origin: cloud:bionic-rocky - cinder-backup: - charm: ../../../cinder-backup - series: bionic - options: - ceph-osd-replication-count: 3 - cinder-ceph: - charm: cs:~openstack-charmers-next/cinder-ceph - options: - ceph-osd-replication-count: 3 - glance: - charm: cs:~openstack-charmers-next/glance - num_units: 1 - nova-compute: - charm: cs:~openstack-charmers-next/nova-compute - num_units: 1 diff --git a/tests/bundles/bionic-stein.yaml b/tests/bundles/bionic-stein.yaml deleted file mode 100644 index 991d4d4..0000000 --- a/tests/bundles/bionic-stein.yaml +++ /dev/null @@ -1,83 +0,0 @@ -series: bionic -relations: -- - cinder-backup:ceph - - ceph-mon:client -- - cinder-ceph:ceph - - ceph-mon:client -- - ceph-osd:mon - - ceph-mon:osd -- - cinder:storage-backend - - cinder-ceph:storage-backend -- - cinder:backup-backend - - cinder-backup:backup-backend -- - keystone:shared-db - - percona-cluster:shared-db -- - cinder:shared-db - - percona-cluster:shared-db -- - cinder:identity-service - - keystone:identity-service -- - cinder:amqp - - rabbitmq-server:amqp -- - glance:image-service - - nova-compute:image-service -- - glance:identity-service - - keystone:identity-service -- - glance:shared-db - - percona-cluster:shared-db -- - nova-compute:ceph-access - - cinder-ceph:ceph-access -- - nova-compute:amqp - - rabbitmq-server:amqp -applications: - percona-cluster: - charm: cs:~openstack-charmers-next/percona-cluster - num_units: 1 - options: - innodb-buffer-pool-size: 256M - max-connections: 1000 - source: cloud:bionic-stein - keystone: - charm: cs:~openstack-charmers-next/keystone - num_units: 1 - options: - openstack-origin: cloud:bionic-stein - rabbitmq-server: - charm: cs:~openstack-charmers-next/rabbitmq-server - num_units: 1 - ceph-mon: - charm: cs:~openstack-charmers-next/ceph-mon - num_units: 3 - options: - monitor-count: '3' - auth-supported: 'none' - source: cloud:bionic-stein - ceph-osd: - charm: cs:~openstack-charmers-next/ceph-osd - num_units: 3 - storage: - osd-devices: 'cinder,10G' - options: - osd-devices: '/dev/test-non-existent' - source: cloud:bionic-stein - cinder: - charm: cs:~openstack-charmers-next/cinder - num_units: 1 - options: - block-device: 'None' - glance-api-version: '2' - openstack-origin: cloud:bionic-stein - cinder-backup: - charm: ../../../cinder-backup - series: bionic - options: - ceph-osd-replication-count: 3 - cinder-ceph: - charm: cs:~openstack-charmers-next/cinder-ceph - options: - ceph-osd-replication-count: 3 - glance: - charm: cs:~openstack-charmers-next/glance - num_units: 1 - nova-compute: - charm: cs:~openstack-charmers-next/nova-compute - num_units: 1 diff --git a/tests/bundles/bionic-train.yaml b/tests/bundles/bionic-train.yaml deleted file mode 100644 index 3f7a53f..0000000 --- a/tests/bundles/bionic-train.yaml +++ /dev/null @@ -1,82 +0,0 @@ -series: bionic -relations: -- - cinder-backup:ceph - - ceph-mon:client -- - cinder-ceph:ceph - - ceph-mon:client -- - ceph-osd:mon - - ceph-mon:osd -- - cinder:storage-backend - - cinder-ceph:storage-backend -- - cinder:backup-backend - - cinder-backup:backup-backend -- - keystone:shared-db - - percona-cluster:shared-db -- - cinder:shared-db - - percona-cluster:shared-db -- - cinder:identity-service - - keystone:identity-service -- - cinder:amqp - - rabbitmq-server:amqp -- - glance:image-service - - nova-compute:image-service -- - glance:identity-service - - keystone:identity-service -- - glance:shared-db - - percona-cluster:shared-db -- - nova-compute:ceph-access - - cinder-ceph:ceph-access -- - nova-compute:amqp - - rabbitmq-server:amqp -applications: - percona-cluster: - charm: cs:~openstack-charmers-next/percona-cluster - num_units: 1 - options: - innodb-buffer-pool-size: 256M - max-connections: 1000 - source: cloud:bionic-train - keystone: - charm: cs:~openstack-charmers-next/keystone - num_units: 1 - options: - openstack-origin: cloud:bionic-train - rabbitmq-server: - charm: cs:~openstack-charmers-next/rabbitmq-server - num_units: 1 - ceph-mon: - charm: cs:~openstack-charmers-next/ceph-mon - num_units: 3 - options: - monitor-count: '3' - source: cloud:bionic-train - ceph-osd: - charm: cs:~openstack-charmers-next/ceph-osd - num_units: 3 - storage: - osd-devices: 'cinder,10G' - options: - osd-devices: '/dev/test-non-existent' - source: cloud:bionic-train - cinder: - charm: cs:~openstack-charmers-next/cinder - num_units: 1 - options: - block-device: 'None' - glance-api-version: '2' - openstack-origin: cloud:bionic-train - cinder-backup: - charm: ../../../cinder-backup - series: bionic - options: - ceph-osd-replication-count: 3 - cinder-ceph: - charm: cs:~openstack-charmers-next/cinder-ceph - options: - ceph-osd-replication-count: 3 - glance: - charm: cs:~openstack-charmers-next/glance - num_units: 1 - nova-compute: - charm: cs:~openstack-charmers-next/nova-compute - num_units: 1 diff --git a/tests/bundles/bionic-ussuri.yaml b/tests/bundles/bionic-ussuri.yaml deleted file mode 100644 index 3f7a53f..0000000 --- a/tests/bundles/bionic-ussuri.yaml +++ /dev/null @@ -1,82 +0,0 @@ -series: bionic -relations: -- - cinder-backup:ceph - - ceph-mon:client -- - cinder-ceph:ceph - - ceph-mon:client -- - ceph-osd:mon - - ceph-mon:osd -- - cinder:storage-backend - - cinder-ceph:storage-backend -- - cinder:backup-backend - - cinder-backup:backup-backend -- - keystone:shared-db - - percona-cluster:shared-db -- - cinder:shared-db - - percona-cluster:shared-db -- - cinder:identity-service - - keystone:identity-service -- - cinder:amqp - - rabbitmq-server:amqp -- - glance:image-service - - nova-compute:image-service -- - glance:identity-service - - keystone:identity-service -- - glance:shared-db - - percona-cluster:shared-db -- - nova-compute:ceph-access - - cinder-ceph:ceph-access -- - nova-compute:amqp - - rabbitmq-server:amqp -applications: - percona-cluster: - charm: cs:~openstack-charmers-next/percona-cluster - num_units: 1 - options: - innodb-buffer-pool-size: 256M - max-connections: 1000 - source: cloud:bionic-train - keystone: - charm: cs:~openstack-charmers-next/keystone - num_units: 1 - options: - openstack-origin: cloud:bionic-train - rabbitmq-server: - charm: cs:~openstack-charmers-next/rabbitmq-server - num_units: 1 - ceph-mon: - charm: cs:~openstack-charmers-next/ceph-mon - num_units: 3 - options: - monitor-count: '3' - source: cloud:bionic-train - ceph-osd: - charm: cs:~openstack-charmers-next/ceph-osd - num_units: 3 - storage: - osd-devices: 'cinder,10G' - options: - osd-devices: '/dev/test-non-existent' - source: cloud:bionic-train - cinder: - charm: cs:~openstack-charmers-next/cinder - num_units: 1 - options: - block-device: 'None' - glance-api-version: '2' - openstack-origin: cloud:bionic-train - cinder-backup: - charm: ../../../cinder-backup - series: bionic - options: - ceph-osd-replication-count: 3 - cinder-ceph: - charm: cs:~openstack-charmers-next/cinder-ceph - options: - ceph-osd-replication-count: 3 - glance: - charm: cs:~openstack-charmers-next/glance - num_units: 1 - nova-compute: - charm: cs:~openstack-charmers-next/nova-compute - num_units: 1 diff --git a/tests/bundles/focal-ussuri.yaml b/tests/bundles/focal-ussuri.yaml deleted file mode 100644 index 1e1a2bf..0000000 --- a/tests/bundles/focal-ussuri.yaml +++ /dev/null @@ -1,164 +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': - '4': - '5': - '6': - '7': - '8': - '9': - '10': - '11': - '12': - '13': - -applications: - - keystone-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router - cinder-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router - glance-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' - - keystone: - charm: cs:~openstack-charmers-next/keystone - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '3' - - rabbitmq-server: - charm: cs:~openstack-charmers-next/rabbitmq-server - num_units: 1 - to: - - '4' - - ceph-mon: - charm: cs:~openstack-charmers-next/ceph-mon - num_units: 3 - options: - monitor-count: '3' - source: *openstack-origin - to: - - '5' - - '6' - - '7' - - ceph-osd: - charm: cs:~openstack-charmers-next/ceph-osd - num_units: 3 - storage: - osd-devices: 'cinder,10G' - options: - osd-devices: '/dev/test-non-existent' - source: *openstack-origin - to: - - '8' - - '9' - - '10' - - cinder: - charm: cs:~openstack-charmers-next/cinder - num_units: 1 - options: - block-device: 'None' - glance-api-version: '2' - openstack-origin: *openstack-origin - to: - - '11' - - cinder-backup: - charm: ../../../cinder-backup - options: - ceph-osd-replication-count: 3 - - cinder-ceph: - charm: cs:~openstack-charmers-next/cinder-ceph - options: - ceph-osd-replication-count: 3 - - glance: - charm: cs:~openstack-charmers-next/glance - num_units: 1 - to: - - '12' - - nova-compute: - charm: cs:~openstack-charmers-next/nova-compute - num_units: 1 - to: - - '13' - -relations: - - - - 'cinder-backup:ceph' - - 'ceph-mon:client' - - - - 'cinder-ceph:ceph' - - 'ceph-mon:client' - - - - 'ceph-osd:mon' - - 'ceph-mon:osd' - - - - 'cinder:storage-backend' - - 'cinder-ceph:storage-backend' - - - - 'cinder:backup-backend' - - 'cinder-backup:backup-backend' - - - - 'keystone:shared-db' - - 'keystone-mysql-router:shared-db' - - - 'keystone-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - - 'cinder:shared-db' - - 'cinder-mysql-router:shared-db' - - - 'cinder-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - - 'cinder:identity-service' - - 'keystone:identity-service' - - - - 'cinder:amqp' - - 'rabbitmq-server:amqp' - - - - 'glance:image-service' - - 'nova-compute:image-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' - - - - 'nova-compute:ceph-access' - - 'cinder-ceph:ceph-access' - - - - 'nova-compute:amqp' - - 'rabbitmq-server:amqp' diff --git a/tests/bundles/focal-victoria.yaml b/tests/bundles/focal-victoria.yaml deleted file mode 100644 index c0bcc59..0000000 --- a/tests/bundles/focal-victoria.yaml +++ /dev/null @@ -1,164 +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': - '4': - '5': - '6': - '7': - '8': - '9': - '10': - '11': - '12': - '13': - -applications: - - keystone-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router - cinder-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router - glance-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' - - keystone: - charm: cs:~openstack-charmers-next/keystone - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '3' - - rabbitmq-server: - charm: cs:~openstack-charmers-next/rabbitmq-server - num_units: 1 - to: - - '4' - - ceph-mon: - charm: cs:~openstack-charmers-next/ceph-mon - num_units: 3 - options: - monitor-count: '3' - source: *openstack-origin - to: - - '5' - - '6' - - '7' - - ceph-osd: - charm: cs:~openstack-charmers-next/ceph-osd - num_units: 3 - storage: - osd-devices: 'cinder,10G' - options: - osd-devices: '/dev/test-non-existent' - source: *openstack-origin - to: - - '8' - - '9' - - '10' - - cinder: - charm: cs:~openstack-charmers-next/cinder - num_units: 1 - options: - block-device: 'None' - glance-api-version: '2' - openstack-origin: *openstack-origin - to: - - '11' - - cinder-backup: - charm: ../../../cinder-backup - options: - ceph-osd-replication-count: 3 - - cinder-ceph: - charm: cs:~openstack-charmers-next/cinder-ceph - options: - ceph-osd-replication-count: 3 - - glance: - charm: cs:~openstack-charmers-next/glance - num_units: 1 - to: - - '12' - - nova-compute: - charm: cs:~openstack-charmers-next/nova-compute - num_units: 1 - to: - - '13' - -relations: - - - - 'cinder-backup:ceph' - - 'ceph-mon:client' - - - - 'cinder-ceph:ceph' - - 'ceph-mon:client' - - - - 'ceph-osd:mon' - - 'ceph-mon:osd' - - - - 'cinder:storage-backend' - - 'cinder-ceph:storage-backend' - - - - 'cinder:backup-backend' - - 'cinder-backup:backup-backend' - - - - 'keystone:shared-db' - - 'keystone-mysql-router:shared-db' - - - 'keystone-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - - 'cinder:shared-db' - - 'cinder-mysql-router:shared-db' - - - 'cinder-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - - 'cinder:identity-service' - - 'keystone:identity-service' - - - - 'cinder:amqp' - - 'rabbitmq-server:amqp' - - - - 'glance:image-service' - - 'nova-compute:image-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' - - - - 'nova-compute:ceph-access' - - 'cinder-ceph:ceph-access' - - - - 'nova-compute:amqp' - - 'rabbitmq-server:amqp' diff --git a/tests/bundles/focal-wallaby.yaml b/tests/bundles/focal-wallaby.yaml deleted file mode 100644 index 579b0b3..0000000 --- a/tests/bundles/focal-wallaby.yaml +++ /dev/null @@ -1,164 +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': - '4': - '5': - '6': - '7': - '8': - '9': - '10': - '11': - '12': - '13': - -applications: - - keystone-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router - cinder-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router - glance-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' - - keystone: - charm: cs:~openstack-charmers-next/keystone - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '3' - - rabbitmq-server: - charm: cs:~openstack-charmers-next/rabbitmq-server - num_units: 1 - to: - - '4' - - ceph-mon: - charm: cs:~openstack-charmers-next/ceph-mon - num_units: 3 - options: - monitor-count: '3' - source: *openstack-origin - to: - - '5' - - '6' - - '7' - - ceph-osd: - charm: cs:~openstack-charmers-next/ceph-osd - num_units: 3 - storage: - osd-devices: 'cinder,10G' - options: - osd-devices: '/dev/test-non-existent' - source: *openstack-origin - to: - - '8' - - '9' - - '10' - - cinder: - charm: cs:~openstack-charmers-next/cinder - num_units: 1 - options: - block-device: 'None' - glance-api-version: '2' - openstack-origin: *openstack-origin - to: - - '11' - - cinder-backup: - charm: ../../../cinder-backup - options: - ceph-osd-replication-count: 3 - - cinder-ceph: - charm: cs:~openstack-charmers-next/cinder-ceph - options: - ceph-osd-replication-count: 3 - - glance: - charm: cs:~openstack-charmers-next/glance - num_units: 1 - to: - - '12' - - nova-compute: - charm: cs:~openstack-charmers-next/nova-compute - num_units: 1 - to: - - '13' - -relations: - - - - 'cinder-backup:ceph' - - 'ceph-mon:client' - - - - 'cinder-ceph:ceph' - - 'ceph-mon:client' - - - - 'ceph-osd:mon' - - 'ceph-mon:osd' - - - - 'cinder:storage-backend' - - 'cinder-ceph:storage-backend' - - - - 'cinder:backup-backend' - - 'cinder-backup:backup-backend' - - - - 'keystone:shared-db' - - 'keystone-mysql-router:shared-db' - - - 'keystone-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - - 'cinder:shared-db' - - 'cinder-mysql-router:shared-db' - - - 'cinder-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - - 'cinder:identity-service' - - 'keystone:identity-service' - - - - 'cinder:amqp' - - 'rabbitmq-server:amqp' - - - - 'glance:image-service' - - 'nova-compute:image-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' - - - - 'nova-compute:ceph-access' - - 'cinder-ceph:ceph-access' - - - - 'nova-compute:amqp' - - 'rabbitmq-server:amqp' diff --git a/tests/bundles/focal-xena.yaml b/tests/bundles/focal-xena.yaml index b079c8e..4b1f94f 100644 --- a/tests/bundles/focal-xena.yaml +++ b/tests/bundles/focal-xena.yaml @@ -27,14 +27,17 @@ machines: applications: keystone-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 glance-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 @@ -42,23 +45,26 @@ applications: - '0' - '1' - '2' + channel: latest/edge keystone: - charm: cs:~openstack-charmers-next/keystone + charm: ch:keystone num_units: 1 options: openstack-origin: *openstack-origin to: - '3' + channel: latest/edge rabbitmq-server: - charm: cs:~openstack-charmers-next/rabbitmq-server + charm: ch:rabbitmq-server num_units: 1 to: - '4' + channel: latest/edge ceph-mon: - charm: cs:~openstack-charmers-next/ceph-mon + charm: ch:ceph-mon num_units: 3 options: monitor-count: '3' @@ -67,9 +73,10 @@ applications: - '5' - '6' - '7' + channel: latest/edge ceph-osd: - charm: cs:~openstack-charmers-next/ceph-osd + charm: ch:ceph-osd num_units: 3 storage: osd-devices: 'cinder,10G' @@ -80,9 +87,10 @@ applications: - '8' - '9' - '10' + channel: latest/edge cinder: - charm: cs:~openstack-charmers-next/cinder + charm: ch:cinder num_units: 1 options: block-device: 'None' @@ -90,6 +98,7 @@ applications: openstack-origin: *openstack-origin to: - '11' + channel: latest/edge cinder-backup: charm: ../../../cinder-backup @@ -97,21 +106,24 @@ applications: ceph-osd-replication-count: 3 cinder-ceph: - charm: cs:~openstack-charmers-next/cinder-ceph + charm: ch:cinder-ceph options: ceph-osd-replication-count: 3 + channel: latest/edge glance: - charm: cs:~openstack-charmers-next/glance + charm: ch:glance num_units: 1 to: - '12' + channel: latest/edge nova-compute: - charm: cs:~openstack-charmers-next/nova-compute + charm: ch:nova-compute num_units: 1 to: - '13' + channel: latest/edge relations: diff --git a/tests/bundles/focal-yoga.yaml b/tests/bundles/focal-yoga.yaml index fa0f2ec..b9a1d0d 100644 --- a/tests/bundles/focal-yoga.yaml +++ b/tests/bundles/focal-yoga.yaml @@ -27,14 +27,17 @@ machines: applications: keystone-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 glance-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 @@ -42,23 +45,26 @@ applications: - '0' - '1' - '2' + channel: latest/edge keystone: - charm: cs:~openstack-charmers-next/keystone + charm: ch:keystone num_units: 1 options: openstack-origin: *openstack-origin to: - '3' + channel: latest/edge rabbitmq-server: - charm: cs:~openstack-charmers-next/rabbitmq-server + charm: ch:rabbitmq-server num_units: 1 to: - '4' + channel: latest/edge ceph-mon: - charm: cs:~openstack-charmers-next/ceph-mon + charm: ch:ceph-mon num_units: 3 options: monitor-count: '3' @@ -67,9 +73,10 @@ applications: - '5' - '6' - '7' + channel: latest/edge ceph-osd: - charm: cs:~openstack-charmers-next/ceph-osd + charm: ch:ceph-osd num_units: 3 storage: osd-devices: 'cinder,10G' @@ -80,9 +87,10 @@ applications: - '8' - '9' - '10' + channel: latest/edge cinder: - charm: cs:~openstack-charmers-next/cinder + charm: ch:cinder num_units: 1 options: block-device: 'None' @@ -90,6 +98,7 @@ applications: openstack-origin: *openstack-origin to: - '11' + channel: latest/edge cinder-backup: charm: ../../../cinder-backup @@ -97,21 +106,24 @@ applications: ceph-osd-replication-count: 3 cinder-ceph: - charm: cs:~openstack-charmers-next/cinder-ceph + charm: ch:cinder-ceph options: ceph-osd-replication-count: 3 + channel: latest/edge glance: - charm: cs:~openstack-charmers-next/glance + charm: ch:glance num_units: 1 to: - '12' + channel: latest/edge nova-compute: - charm: cs:~openstack-charmers-next/nova-compute + charm: ch:nova-compute num_units: 1 to: - '13' + channel: latest/edge relations: diff --git a/tests/bundles/hirsute-wallaby.yaml b/tests/bundles/hirsute-wallaby.yaml deleted file mode 100644 index f971c17..0000000 --- a/tests/bundles/hirsute-wallaby.yaml +++ /dev/null @@ -1,164 +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': - '4': - '5': - '6': - '7': - '8': - '9': - '10': - '11': - '12': - '13': - -applications: - - keystone-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router - cinder-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router - glance-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' - - keystone: - charm: cs:~openstack-charmers-next/keystone - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '3' - - rabbitmq-server: - charm: cs:~openstack-charmers-next/rabbitmq-server - num_units: 1 - to: - - '4' - - ceph-mon: - charm: cs:~openstack-charmers-next/ceph-mon - num_units: 3 - options: - monitor-count: '3' - source: *openstack-origin - to: - - '5' - - '6' - - '7' - - ceph-osd: - charm: cs:~openstack-charmers-next/ceph-osd - num_units: 3 - storage: - osd-devices: 'cinder,10G' - options: - osd-devices: '/dev/test-non-existent' - source: *openstack-origin - to: - - '8' - - '9' - - '10' - - cinder: - charm: cs:~openstack-charmers-next/cinder - num_units: 1 - options: - block-device: 'None' - glance-api-version: '2' - openstack-origin: *openstack-origin - to: - - '11' - - cinder-backup: - charm: ../../../cinder-backup - options: - ceph-osd-replication-count: 3 - - cinder-ceph: - charm: cs:~openstack-charmers-next/cinder-ceph - options: - ceph-osd-replication-count: 3 - - glance: - charm: cs:~openstack-charmers-next/glance - num_units: 1 - to: - - '12' - - nova-compute: - charm: cs:~openstack-charmers-next/nova-compute - num_units: 1 - to: - - '13' - -relations: - - - - 'cinder-backup:ceph' - - 'ceph-mon:client' - - - - 'cinder-ceph:ceph' - - 'ceph-mon:client' - - - - 'ceph-osd:mon' - - 'ceph-mon:osd' - - - - 'cinder:storage-backend' - - 'cinder-ceph:storage-backend' - - - - 'cinder:backup-backend' - - 'cinder-backup:backup-backend' - - - - 'keystone:shared-db' - - 'keystone-mysql-router:shared-db' - - - 'keystone-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - - 'cinder:shared-db' - - 'cinder-mysql-router:shared-db' - - - 'cinder-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - - 'cinder:identity-service' - - 'keystone:identity-service' - - - - 'cinder:amqp' - - 'rabbitmq-server:amqp' - - - - 'glance:image-service' - - 'nova-compute:image-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' - - - - 'nova-compute:ceph-access' - - 'cinder-ceph:ceph-access' - - - - 'nova-compute:amqp' - - 'rabbitmq-server:amqp' diff --git a/tests/bundles/impish-xena.yaml b/tests/bundles/impish-xena.yaml index f9332c4..1c42179 100644 --- a/tests/bundles/impish-xena.yaml +++ b/tests/bundles/impish-xena.yaml @@ -27,14 +27,17 @@ machines: applications: keystone-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 glance-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 @@ -42,23 +45,26 @@ applications: - '0' - '1' - '2' + channel: latest/edge keystone: - charm: cs:~openstack-charmers-next/keystone + charm: ch:keystone num_units: 1 options: openstack-origin: *openstack-origin to: - '3' + channel: latest/edge rabbitmq-server: - charm: cs:~openstack-charmers-next/rabbitmq-server + charm: ch:rabbitmq-server num_units: 1 to: - '4' + channel: latest/edge ceph-mon: - charm: cs:~openstack-charmers-next/ceph-mon + charm: ch:ceph-mon num_units: 3 options: monitor-count: '3' @@ -67,9 +73,10 @@ applications: - '5' - '6' - '7' + channel: latest/edge ceph-osd: - charm: cs:~openstack-charmers-next/ceph-osd + charm: ch:ceph-osd num_units: 3 storage: osd-devices: 'cinder,10G' @@ -80,9 +87,10 @@ applications: - '8' - '9' - '10' + channel: latest/edge cinder: - charm: cs:~openstack-charmers-next/cinder + charm: ch:cinder num_units: 1 options: block-device: 'None' @@ -90,6 +98,7 @@ applications: openstack-origin: *openstack-origin to: - '11' + channel: latest/edge cinder-backup: charm: ../../../cinder-backup @@ -97,21 +106,24 @@ applications: ceph-osd-replication-count: 3 cinder-ceph: - charm: cs:~openstack-charmers-next/cinder-ceph + charm: ch:cinder-ceph options: ceph-osd-replication-count: 3 + channel: latest/edge glance: - charm: cs:~openstack-charmers-next/glance + charm: ch:glance num_units: 1 to: - '12' + channel: latest/edge nova-compute: - charm: cs:~openstack-charmers-next/nova-compute + charm: ch:nova-compute num_units: 1 to: - '13' + channel: latest/edge relations: diff --git a/tests/bundles/jammy-yoga.yaml b/tests/bundles/jammy-yoga.yaml index a8a38ac..9c1233a 100644 --- a/tests/bundles/jammy-yoga.yaml +++ b/tests/bundles/jammy-yoga.yaml @@ -27,14 +27,17 @@ machines: applications: keystone-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 glance-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 @@ -42,23 +45,26 @@ applications: - '0' - '1' - '2' + channel: latest/edge keystone: - charm: cs:~openstack-charmers-next/keystone + charm: ch:keystone num_units: 1 options: openstack-origin: *openstack-origin to: - '3' + channel: latest/edge rabbitmq-server: - charm: cs:~openstack-charmers-next/rabbitmq-server + charm: ch:rabbitmq-server num_units: 1 to: - '4' + channel: latest/edge ceph-mon: - charm: cs:~openstack-charmers-next/ceph-mon + charm: ch:ceph-mon num_units: 3 options: monitor-count: '3' @@ -67,9 +73,10 @@ applications: - '5' - '6' - '7' + channel: latest/edge ceph-osd: - charm: cs:~openstack-charmers-next/ceph-osd + charm: ch:ceph-osd num_units: 3 storage: osd-devices: 'cinder,10G' @@ -80,9 +87,10 @@ applications: - '8' - '9' - '10' + channel: latest/edge cinder: - charm: cs:~openstack-charmers-next/cinder + charm: ch:cinder num_units: 1 options: block-device: 'None' @@ -90,6 +98,7 @@ applications: openstack-origin: *openstack-origin to: - '11' + channel: latest/edge cinder-backup: charm: ../../../cinder-backup @@ -97,21 +106,24 @@ applications: ceph-osd-replication-count: 3 cinder-ceph: - charm: cs:~openstack-charmers-next/cinder-ceph + charm: ch:cinder-ceph options: ceph-osd-replication-count: 3 + channel: latest/edge glance: - charm: cs:~openstack-charmers-next/glance + charm: ch:glance num_units: 1 to: - '12' + channel: latest/edge nova-compute: - charm: cs:~openstack-charmers-next/nova-compute + charm: ch:nova-compute num_units: 1 to: - '13' + channel: latest/edge relations: diff --git a/tests/tests.yaml b/tests/tests.yaml index 019c401..4ca09d0 100644 --- a/tests/tests.yaml +++ b/tests/tests.yaml @@ -1,22 +1,13 @@ charm_name: cinder-backup smoke_bundles: - - focal-ussuri + - focal-xena gate_bundles: - - bionic-queens - - bionic-stein - - bionic-ussuri - - focal-ussuri - - focal-victoria - - focal-wallaby - focal-xena - - hirsute-wallaby - impish-xena dev_bundles: - - bionic-rocky - - bionic-train - focal-yoga - jammy-yoga @@ -25,6 +16,5 @@ tests: tests_options: force_deploy: - - hirsute-wallaby - impish-xena - jammy-yoga