From ff00233cff5b1a2ec365862d473df3760810ef72 Mon Sep 17 00:00:00 2001 From: Alex Kavanagh Date: Thu, 27 Jan 2022 11:51:06 +0000 Subject: [PATCH] Migrate charm to charmhub latest/edge track Change-Id: Iaea6a19a806aeddd6551cdca3120c4d115b5a4cd --- charmcraft.yaml | 27 +++ metadata.yaml | 3 - osci.yaml | 65 ++---- tests/bundles/bionic-queens.yaml | 127 ------------ tests/bundles/bionic-rocky.yaml | 138 ------------- tests/bundles/bionic-stein.yaml | 138 ------------- tests/bundles/bionic-train.yaml | 149 -------------- tests/bundles/bionic-ussuri.yaml | 148 -------------- tests/bundles/focal-ussuri-ec.yaml | 284 -------------------------- tests/bundles/focal-ussuri.yaml | 274 ------------------------- tests/bundles/focal-victoria-ec.yaml | 284 -------------------------- tests/bundles/focal-victoria.yaml | 274 ------------------------- tests/bundles/focal-wallaby-ec.yaml | 284 -------------------------- tests/bundles/focal-wallaby.yaml | 274 ------------------------- tests/bundles/focal-xena-ec.yaml | 57 ++++-- tests/bundles/focal-xena.yaml | 57 ++++-- tests/bundles/focal-yoga-ec.yaml | 57 ++++-- tests/bundles/focal-yoga.yaml | 57 ++++-- tests/bundles/hirsute-wallaby-ec.yaml | 284 -------------------------- tests/bundles/hirsute-wallaby.yaml | 274 ------------------------- tests/bundles/impish-xena-ec.yaml | 57 ++++-- tests/bundles/impish-xena.yaml | 57 ++++-- tests/bundles/jammy-yoga-ec.yaml | 57 ++++-- tests/bundles/jammy-yoga.yaml | 57 ++++-- tests/tests.yaml | 17 +- 25 files changed, 351 insertions(+), 3149 deletions(-) create mode 100644 charmcraft.yaml delete mode 100644 tests/bundles/bionic-queens.yaml delete mode 100644 tests/bundles/bionic-rocky.yaml delete mode 100644 tests/bundles/bionic-stein.yaml delete mode 100644 tests/bundles/bionic-train.yaml delete mode 100644 tests/bundles/bionic-ussuri.yaml delete mode 100644 tests/bundles/focal-ussuri-ec.yaml delete mode 100644 tests/bundles/focal-ussuri.yaml delete mode 100644 tests/bundles/focal-victoria-ec.yaml delete mode 100644 tests/bundles/focal-victoria.yaml delete mode 100644 tests/bundles/focal-wallaby-ec.yaml delete mode 100644 tests/bundles/focal-wallaby.yaml delete mode 100644 tests/bundles/hirsute-wallaby-ec.yaml delete mode 100644 tests/bundles/hirsute-wallaby.yaml 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 f8d969a..4a08513 100644 --- a/metadata.yaml +++ b/metadata.yaml @@ -11,10 +11,7 @@ tags: - file-servers - misc series: -- bionic - focal -- groovy -- hirsute - impish subordinate: true provides: diff --git a/osci.yaml b/osci.yaml index 41a7d7a..dca2f5b 100644 --- a/osci.yaml +++ b/osci.yaml @@ -1,73 +1,46 @@ - 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 check: jobs: - - focal-ussuri-ec_cinder-ceph - - focal-victoria-ec_cinder-ceph - - focal-wallaby-ec_cinder-ceph - focal-xena-ec_cinder-ceph - focal-yoga-ec_cinder-ceph: voting: false - - hisute-wallaby-ec_cinder-ceph - impish-xena-ec_cinder-ceph: voting: false - jammy-yoga-ec_cinder-ceph: voting: false -- job: - name: jammy-yoga-ec_cinder-ceph - parent: func-target - dependencies: &smoke-jobs - - bionic-ussuri - vars: - tox_extra_args: jammy-yoga-ec -- job: - name: impish-xena-ec_cinder-ceph - parent: func-target - dependencies: *smoke-jobs - vars: - tox_extra_args: impish-xena-ec -- job: - name: hisute-wallaby-ec_cinder-ceph - parent: func-target - dependencies: *smoke-jobs - vars: - tox_extra_args: hirsute-wallaby-ec -- job: - name: focal-yoga-ec_cinder-ceph - parent: func-target - dependencies: *smoke-jobs - vars: - tox_extra_args: focal-yoga-ec - job: name: focal-xena-ec_cinder-ceph parent: func-target - dependencies: *smoke-jobs + dependencies: + - osci-lint + - tox-py38 + - tox-py39 vars: tox_extra_args: focal-xena-ec - job: - name: focal-wallaby-ec_cinder-ceph + name: focal-yoga-ec_cinder-ceph parent: func-target - dependencies: *smoke-jobs + dependencies: + - focal-xena-ec_cinder-ceph vars: - tox_extra_args: focal-wallaby-ec + tox_extra_args: focal-yoga-ec - job: - name: focal-victoria-ec_cinder-ceph + name: impish-xena-ec_cinder-ceph parent: func-target - dependencies: *smoke-jobs + dependencies: + - focal-xena-ec_cinder-ceph vars: - tox_extra_args: focal-victoria-ec + tox_extra_args: impish-xena-ec - job: - name: focal-ussuri-ec_cinder-ceph + name: jammy-yoga-ec_cinder-ceph parent: func-target - dependencies: *smoke-jobs + dependencies: + - focal-xena-ec_cinder-ceph vars: - tox_extra_args: focal-ussuri-ec + tox_extra_args: jammy-yoga-ec diff --git a/tests/bundles/bionic-queens.yaml b/tests/bundles/bionic-queens.yaml deleted file mode 100644 index fbaa0e2..0000000 --- a/tests/bundles/bionic-queens.yaml +++ /dev/null @@ -1,127 +0,0 @@ -series: bionic -relations: -- - nova-compute:image-service - - glance:image-service -- - nova-compute:amqp - - rabbitmq-server:amqp -- - nova-cloud-controller:shared-db - - percona-cluster:shared-db -- - nova-cloud-controller:identity-service - - keystone:identity-service -- - nova-cloud-controller:amqp - - rabbitmq-server:amqp -- - nova-cloud-controller:cloud-compute - - nova-compute:cloud-compute -- - nova-cloud-controller:image-service - - glance:image-service -- - keystone:shared-db - - percona-cluster:shared-db -- - glance:identity-service - - keystone:identity-service -- - glance:shared-db - - percona-cluster:shared-db -- - glance:amqp - - rabbitmq-server:amqp -- - glance:ceph - - ceph-mon:client -- - neutron-gateway:amqp - - rabbitmq-server:amqp -- - nova-cloud-controller:quantum-network-service - - neutron-gateway:quantum-network-service -- - neutron-api:shared-db - - percona-cluster:shared-db -- - neutron-api:amqp - - rabbitmq-server:amqp -- - neutron-api:neutron-api - - nova-cloud-controller:neutron-api -- - neutron-api:identity-service - - keystone:identity-service -- - nova-compute:neutron-plugin - - neutron-openvswitch:neutron-plugin -- - rabbitmq-server:amqp - - neutron-openvswitch:amqp -- - cinder:shared-db - - percona-cluster:shared-db -- - cinder:identity-service - - keystone:identity-service -- - cinder:amqp - - rabbitmq-server:amqp -- - cinder:image-service - - glance:image-service -- - cinder-ceph:storage-backend - - cinder:storage-backend -- - nova-compute:ceph-access - - cinder-ceph:ceph-access -- - ceph-mon:client - - cinder-ceph:ceph -- - ceph-mon:osd - - ceph-osd:mon -applications: - rabbitmq-server: - charm: cs:~openstack-charmers-next/rabbitmq-server - num_units: 1 - percona-cluster: - charm: cs:~openstack-charmers-next/percona-cluster - num_units: 1 - options: - max-connections: 1000 - innodb-buffer-pool-size: 256M - nova-cloud-controller: - charm: cs:~openstack-charmers-next/nova-cloud-controller - num_units: 1 - options: - network-manager: Neutron - debug: true - neutron-api: - charm: cs:~openstack-charmers-next/neutron-api - num_units: 1 - options: - flat-network-providers: physnet1 - neutron-security-groups: true - keystone: - charm: cs:~openstack-charmers-next/keystone - num_units: 1 - neutron-gateway: - charm: cs:~openstack-charmers-next/neutron-gateway - num_units: 1 - options: - bridge-mappings: physnet1:br-ex - glance: - charm: cs:~openstack-charmers-next/glance - num_units: 1 - neutron-openvswitch: - charm: cs:~openstack-charmers-next/neutron-openvswitch - nova-compute: - charm: cs:~openstack-charmers-next/nova-compute - num_units: 1 - constraints: mem=4G cores=4 - options: - config-flags: auto_assign_floating_ip=False - enable-live-migration: false - aa-profile-mode: enforce - ephemeral-device: /dev/vdb - ephemeral-unmount: /mnt - debug: true - ceph-osd: - charm: cs:~openstack-charmers-next/ceph-osd - num_units: 3 - storage: - osd-devices: '10G' - options: - osd-devices: '/dev/test-non-existent' - ceph-mon: - charm: cs:~openstack-charmers-next/ceph-mon - num_units: 3 - options: - auth-supported: 'none' - monitor-count: '3' - cinder: - charm: cs:~openstack-charmers-next/cinder - num_units: 1 - options: - debug: True - verbose: True - block-device: None - glance-api-version: 2 - cinder-ceph: - charm: ../../../cinder-ceph diff --git a/tests/bundles/bionic-rocky.yaml b/tests/bundles/bionic-rocky.yaml deleted file mode 100644 index 42014dd..0000000 --- a/tests/bundles/bionic-rocky.yaml +++ /dev/null @@ -1,138 +0,0 @@ -series: bionic -relations: -- - nova-compute:image-service - - glance:image-service -- - nova-compute:amqp - - rabbitmq-server:amqp -- - nova-cloud-controller:shared-db - - percona-cluster:shared-db -- - nova-cloud-controller:identity-service - - keystone:identity-service -- - nova-cloud-controller:amqp - - rabbitmq-server:amqp -- - nova-cloud-controller:cloud-compute - - nova-compute:cloud-compute -- - nova-cloud-controller:image-service - - glance:image-service -- - keystone:shared-db - - percona-cluster:shared-db -- - glance:identity-service - - keystone:identity-service -- - glance:shared-db - - percona-cluster:shared-db -- - glance:amqp - - rabbitmq-server:amqp -- - glance:ceph - - ceph-mon:client -- - neutron-gateway:amqp - - rabbitmq-server:amqp -- - nova-cloud-controller:quantum-network-service - - neutron-gateway:quantum-network-service -- - neutron-api:shared-db - - percona-cluster:shared-db -- - neutron-api:amqp - - rabbitmq-server:amqp -- - neutron-api:neutron-api - - nova-cloud-controller:neutron-api -- - neutron-api:identity-service - - keystone:identity-service -- - nova-compute:neutron-plugin - - neutron-openvswitch:neutron-plugin -- - rabbitmq-server:amqp - - neutron-openvswitch:amqp -- - cinder:shared-db - - percona-cluster:shared-db -- - cinder:identity-service - - keystone:identity-service -- - cinder:amqp - - rabbitmq-server:amqp -- - cinder:image-service - - glance:image-service -- - cinder-ceph:storage-backend - - cinder:storage-backend -- - nova-compute:ceph-access - - cinder-ceph:ceph-access -- - ceph-mon:client - - cinder-ceph:ceph -- - ceph-mon:osd - - ceph-osd:mon -applications: - rabbitmq-server: - charm: cs:~openstack-charmers-next/rabbitmq-server - num_units: 1 - percona-cluster: - charm: cs:~openstack-charmers-next/percona-cluster - num_units: 1 - options: - max-connections: 1000 - innodb-buffer-pool-size: 256M - nova-cloud-controller: - charm: cs:~openstack-charmers-next/nova-cloud-controller - num_units: 1 - options: - openstack-origin: cloud:bionic-rocky - network-manager: Neutron - debug: true - neutron-api: - charm: cs:~openstack-charmers-next/neutron-api - num_units: 1 - options: - openstack-origin: cloud:bionic-rocky - flat-network-providers: physnet1 - neutron-security-groups: true - keystone: - charm: cs:~openstack-charmers-next/keystone - num_units: 1 - options: - openstack-origin: cloud:bionic-rocky - neutron-gateway: - charm: cs:~openstack-charmers-next/neutron-gateway - num_units: 1 - options: - openstack-origin: cloud:bionic-rocky - bridge-mappings: physnet1:br-ex - glance: - charm: cs:~openstack-charmers-next/glance - num_units: 1 - options: - openstack-origin: cloud:bionic-rocky - neutron-openvswitch: - charm: cs:~openstack-charmers-next/neutron-openvswitch - nova-compute: - charm: cs:~openstack-charmers-next/nova-compute - num_units: 1 - constraints: mem=4G cores=4 - options: - openstack-origin: cloud:bionic-rocky - config-flags: auto_assign_floating_ip=False - enable-live-migration: false - aa-profile-mode: enforce - ephemeral-device: /dev/vdb - ephemeral-unmount: /mnt - debug: true - ceph-osd: - charm: cs:~openstack-charmers-next/ceph-osd - num_units: 3 - storage: - osd-devices: '10G' - options: - osd-devices: '/dev/test-non-existent' - source: cloud:bionic-rocky - ceph-mon: - charm: cs:~openstack-charmers-next/ceph-mon - num_units: 3 - options: - auth-supported: 'none' - monitor-count: '3' - source: cloud:bionic-rocky - cinder: - charm: cs:~openstack-charmers-next/cinder - num_units: 1 - options: - debug: True - verbose: True - openstack-origin: cloud:bionic-rocky - block-device: None - glance-api-version: 2 - cinder-ceph: - charm: ../../../cinder-ceph diff --git a/tests/bundles/bionic-stein.yaml b/tests/bundles/bionic-stein.yaml deleted file mode 100644 index 5299020..0000000 --- a/tests/bundles/bionic-stein.yaml +++ /dev/null @@ -1,138 +0,0 @@ -series: bionic -relations: -- - nova-compute:image-service - - glance:image-service -- - nova-compute:amqp - - rabbitmq-server:amqp -- - nova-cloud-controller:shared-db - - percona-cluster:shared-db -- - nova-cloud-controller:identity-service - - keystone:identity-service -- - nova-cloud-controller:amqp - - rabbitmq-server:amqp -- - nova-cloud-controller:cloud-compute - - nova-compute:cloud-compute -- - nova-cloud-controller:image-service - - glance:image-service -- - keystone:shared-db - - percona-cluster:shared-db -- - glance:identity-service - - keystone:identity-service -- - glance:shared-db - - percona-cluster:shared-db -- - glance:amqp - - rabbitmq-server:amqp -- - glance:ceph - - ceph-mon:client -- - neutron-gateway:amqp - - rabbitmq-server:amqp -- - nova-cloud-controller:quantum-network-service - - neutron-gateway:quantum-network-service -- - neutron-api:shared-db - - percona-cluster:shared-db -- - neutron-api:amqp - - rabbitmq-server:amqp -- - neutron-api:neutron-api - - nova-cloud-controller:neutron-api -- - neutron-api:identity-service - - keystone:identity-service -- - nova-compute:neutron-plugin - - neutron-openvswitch:neutron-plugin -- - rabbitmq-server:amqp - - neutron-openvswitch:amqp -- - cinder:shared-db - - percona-cluster:shared-db -- - cinder:identity-service - - keystone:identity-service -- - cinder:amqp - - rabbitmq-server:amqp -- - cinder:image-service - - glance:image-service -- - cinder-ceph:storage-backend - - cinder:storage-backend -- - nova-compute:ceph-access - - cinder-ceph:ceph-access -- - ceph-mon:client - - cinder-ceph:ceph -- - ceph-mon:osd - - ceph-osd:mon -applications: - rabbitmq-server: - charm: cs:~openstack-charmers-next/rabbitmq-server - num_units: 1 - percona-cluster: - charm: cs:~openstack-charmers-next/percona-cluster - num_units: 1 - options: - max-connections: 1000 - innodb-buffer-pool-size: 256M - nova-cloud-controller: - charm: cs:~openstack-charmers-next/nova-cloud-controller - num_units: 1 - options: - openstack-origin: cloud:bionic-stein - network-manager: Neutron - debug: true - neutron-api: - charm: cs:~openstack-charmers-next/neutron-api - num_units: 1 - options: - openstack-origin: cloud:bionic-stein - flat-network-providers: physnet1 - neutron-security-groups: true - keystone: - charm: cs:~openstack-charmers-next/keystone - num_units: 1 - options: - openstack-origin: cloud:bionic-stein - neutron-gateway: - charm: cs:~openstack-charmers-next/neutron-gateway - num_units: 1 - options: - openstack-origin: cloud:bionic-stein - bridge-mappings: physnet1:br-ex - glance: - charm: cs:~openstack-charmers-next/glance - num_units: 1 - options: - openstack-origin: cloud:bionic-stein - neutron-openvswitch: - charm: cs:~openstack-charmers-next/neutron-openvswitch - nova-compute: - charm: cs:~openstack-charmers-next/nova-compute - num_units: 1 - constraints: mem=4G cores=4 - options: - openstack-origin: cloud:bionic-stein - config-flags: auto_assign_floating_ip=False - enable-live-migration: false - aa-profile-mode: enforce - ephemeral-device: /dev/vdb - ephemeral-unmount: /mnt - debug: true - ceph-osd: - charm: cs:~openstack-charmers-next/ceph-osd - num_units: 3 - storage: - osd-devices: '10G' - options: - osd-devices: '/dev/test-non-existent' - source: cloud:bionic-stein - ceph-mon: - charm: cs:~openstack-charmers-next/ceph-mon - num_units: 3 - options: - auth-supported: 'none' - monitor-count: '3' - source: cloud:bionic-stein - cinder: - charm: cs:~openstack-charmers-next/cinder - num_units: 1 - options: - debug: True - verbose: True - openstack-origin: cloud:bionic-stein - block-device: None - glance-api-version: 2 - cinder-ceph: - charm: ../../../cinder-ceph diff --git a/tests/bundles/bionic-train.yaml b/tests/bundles/bionic-train.yaml deleted file mode 100644 index d62f7f7..0000000 --- a/tests/bundles/bionic-train.yaml +++ /dev/null @@ -1,149 +0,0 @@ -series: bionic -relations: -- - nova-compute:image-service - - glance:image-service -- - nova-compute:amqp - - rabbitmq-server:amqp -- - nova-cloud-controller:shared-db - - percona-cluster:shared-db -- - nova-cloud-controller:identity-service - - keystone:identity-service -- - nova-cloud-controller:amqp - - rabbitmq-server:amqp -- - nova-cloud-controller:cloud-compute - - nova-compute:cloud-compute -- - nova-cloud-controller:image-service - - glance:image-service -- - placement:shared-db - - percona-cluster:shared-db -- - placement:identity-service - - keystone:identity-service -- - placement:placement - - nova-cloud-controller:placement -- - keystone:shared-db - - percona-cluster:shared-db -- - glance:identity-service - - keystone:identity-service -- - glance:shared-db - - percona-cluster:shared-db -- - glance:amqp - - rabbitmq-server:amqp -- - glance:ceph - - ceph-mon:client -- - neutron-gateway:amqp - - rabbitmq-server:amqp -- - nova-cloud-controller:quantum-network-service - - neutron-gateway:quantum-network-service -- - neutron-api:shared-db - - percona-cluster:shared-db -- - neutron-api:amqp - - rabbitmq-server:amqp -- - neutron-api:neutron-api - - nova-cloud-controller:neutron-api -- - neutron-api:identity-service - - keystone:identity-service -- - nova-compute:neutron-plugin - - neutron-openvswitch:neutron-plugin -- - rabbitmq-server:amqp - - neutron-openvswitch:amqp -- - cinder:shared-db - - percona-cluster:shared-db -- - cinder:identity-service - - keystone:identity-service -- - cinder:amqp - - rabbitmq-server:amqp -- - cinder:image-service - - glance:image-service -- - cinder-ceph:storage-backend - - cinder:storage-backend -- - nova-compute:ceph-access - - cinder-ceph:ceph-access -- - ceph-mon:client - - cinder-ceph:ceph -- - ceph-mon:osd - - ceph-osd:mon -applications: - rabbitmq-server: - charm: cs:~openstack-charmers-next/rabbitmq-server - num_units: 1 - percona-cluster: - charm: cs:~openstack-charmers-next/percona-cluster - num_units: 1 - options: - max-connections: 1000 - innodb-buffer-pool-size: 256M - nova-cloud-controller: - charm: cs:~openstack-charmers-next/nova-cloud-controller - num_units: 1 - options: - openstack-origin: cloud:bionic-train - network-manager: Neutron - debug: true - placement: - charm: cs:~openstack-charmers-next/placement - num_units: 1 - constraints: mem=1G - options: - openstack-origin: cloud:bionic-train - neutron-api: - charm: cs:~openstack-charmers-next/neutron-api - num_units: 1 - options: - openstack-origin: cloud:bionic-train - flat-network-providers: physnet1 - neutron-security-groups: true - keystone: - charm: cs:~openstack-charmers-next/keystone - num_units: 1 - options: - openstack-origin: cloud:bionic-train - neutron-gateway: - charm: cs:~openstack-charmers-next/neutron-gateway - num_units: 1 - options: - openstack-origin: cloud:bionic-train - bridge-mappings: physnet1:br-ex - glance: - charm: cs:~openstack-charmers-next/glance - num_units: 1 - options: - openstack-origin: cloud:bionic-train - neutron-openvswitch: - charm: cs:~openstack-charmers-next/neutron-openvswitch - nova-compute: - charm: cs:~openstack-charmers-next/nova-compute - num_units: 1 - constraints: mem=4G cores=4 - options: - openstack-origin: cloud:bionic-train - config-flags: auto_assign_floating_ip=False - enable-live-migration: false - aa-profile-mode: enforce - ephemeral-device: /dev/vdb - ephemeral-unmount: /mnt - debug: true - ceph-osd: - charm: cs:~openstack-charmers-next/ceph-osd - num_units: 3 - storage: - osd-devices: '10G' - options: - osd-devices: '/dev/test-non-existent' - source: cloud:bionic-train - ceph-mon: - charm: cs:~openstack-charmers-next/ceph-mon - num_units: 3 - options: - monitor-count: '3' - source: cloud:bionic-train - cinder: - charm: cs:~openstack-charmers-next/cinder - num_units: 1 - options: - debug: True - verbose: True - openstack-origin: cloud:bionic-train - block-device: None - glance-api-version: 2 - cinder-ceph: - charm: ../../../cinder-ceph diff --git a/tests/bundles/bionic-ussuri.yaml b/tests/bundles/bionic-ussuri.yaml deleted file mode 100644 index b5ca069..0000000 --- a/tests/bundles/bionic-ussuri.yaml +++ /dev/null @@ -1,148 +0,0 @@ -series: bionic -relations: -- - nova-compute:image-service - - glance:image-service -- - nova-compute:amqp - - rabbitmq-server:amqp -- - nova-cloud-controller:shared-db - - percona-cluster:shared-db -- - nova-cloud-controller:identity-service - - keystone:identity-service -- - nova-cloud-controller:amqp - - rabbitmq-server:amqp -- - nova-cloud-controller:cloud-compute - - nova-compute:cloud-compute -- - nova-cloud-controller:image-service - - glance:image-service -- - placement:shared-db - - percona-cluster:shared-db -- - placement:identity-service - - keystone:identity-service -- - placement:placement - - nova-cloud-controller:placement -- - keystone:shared-db - - percona-cluster:shared-db -- - glance:identity-service - - keystone:identity-service -- - glance:shared-db - - percona-cluster:shared-db -- - glance:amqp - - rabbitmq-server:amqp -- - glance:ceph - - ceph-mon:client -- - neutron-gateway:amqp - - rabbitmq-server:amqp -- - nova-cloud-controller:quantum-network-service - - neutron-gateway:quantum-network-service -- - neutron-api:shared-db - - percona-cluster:shared-db -- - neutron-api:amqp - - rabbitmq-server:amqp -- - neutron-api:neutron-api - - nova-cloud-controller:neutron-api -- - neutron-api:identity-service - - keystone:identity-service -- - nova-compute:neutron-plugin - - neutron-openvswitch:neutron-plugin -- - rabbitmq-server:amqp - - neutron-openvswitch:amqp -- - cinder:shared-db - - percona-cluster:shared-db -- - cinder:identity-service - - keystone:identity-service -- - cinder:amqp - - rabbitmq-server:amqp -- - cinder:image-service - - glance:image-service -- - cinder-ceph:storage-backend - - cinder:storage-backend -- - nova-compute:ceph-access - - cinder-ceph:ceph-access -- - ceph-mon:client - - cinder-ceph:ceph -- - ceph-mon:osd - - ceph-osd:mon -applications: - rabbitmq-server: - charm: cs:~openstack-charmers-next/rabbitmq-server - num_units: 1 - percona-cluster: - charm: cs:~openstack-charmers-next/percona-cluster - num_units: 1 - options: - max-connections: 1000 - innodb-buffer-pool-size: 256M - nova-cloud-controller: - charm: cs:~openstack-charmers-next/nova-cloud-controller - num_units: 1 - options: - openstack-origin: cloud:bionic-ussuri - network-manager: Neutron - debug: true - placement: - charm: cs:~openstack-charmers-next/placement - num_units: 1 - constraints: mem=1G - options: - openstack-origin: cloud:bionic-ussuri - neutron-api: - charm: cs:~openstack-charmers-next/neutron-api - num_units: 1 - options: - manage-neutron-plugin-legacy-mode: true - openstack-origin: cloud:bionic-ussuri - flat-network-providers: physnet1 - neutron-security-groups: true - keystone: - charm: cs:~openstack-charmers-next/keystone - num_units: 1 - options: - openstack-origin: cloud:bionic-ussuri - neutron-gateway: - charm: cs:~openstack-charmers-next/neutron-gateway - num_units: 1 - options: - openstack-origin: cloud:bionic-ussuri - bridge-mappings: physnet1:br-ex - glance: - charm: cs:~openstack-charmers-next/glance - num_units: 1 - options: - openstack-origin: cloud:bionic-ussuri - neutron-openvswitch: - charm: cs:~openstack-charmers-next/neutron-openvswitch - nova-compute: - charm: cs:~openstack-charmers-next/nova-compute - num_units: 1 - constraints: mem=4G cores=4 - options: - openstack-origin: cloud:bionic-ussuri - config-flags: auto_assign_floating_ip=False - enable-live-migration: false - aa-profile-mode: enforce - ephemeral-device: /dev/vdb - ephemeral-unmount: /mnt - debug: true - ceph-osd: - charm: cs:~openstack-charmers-next/ceph-osd - num_units: 3 - storage: - osd-devices: '10G' - options: - osd-devices: '/dev/test-non-existent' - source: cloud:bionic-ussuri - ceph-mon: - charm: cs:~openstack-charmers-next/ceph-mon - num_units: 3 - options: - monitor-count: '3' - source: cloud:bionic-ussuri - cinder: - charm: cs:~openstack-charmers-next/cinder - num_units: 1 - options: - openstack-origin: cloud:bionic-ussuri - block-device: None - glance-api-version: 2 - cinder-ceph: - charm: ../../../cinder-ceph diff --git a/tests/bundles/focal-ussuri-ec.yaml b/tests/bundles/focal-ussuri-ec.yaml deleted file mode 100644 index b5d4fbf..0000000 --- a/tests/bundles/focal-ussuri-ec.yaml +++ /dev/null @@ -1,284 +0,0 @@ -variables: - openstack-origin: &openstack-origin distro - -series: &series focal - -machines: - 0: - 1: - 2: - 3: - 4: - 5: - 6: - 7: - 8: - 9: - 10: - 11: - 12: - 13: - 14: - 15: - 16: - # for the nova-compute unit - 17: - constraints: mem=4G cores=4 root-disk=20G - 18: - 19: - 20: - -applications: - - nova-cloud-controller-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router - placement-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router - keystone-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router - glance-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router - neutron-api-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router - cinder-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-osd: - charm: cs:~openstack-charmers-next/ceph-osd - num_units: 6 - storage: - osd-devices: '10G' - options: - osd-devices: '/dev/test-non-existent' - source: *openstack-origin - to: - - '3' - - '4' - - '5' - - '18' - - '19' - - '20' - - ceph-mon: - charm: cs:~openstack-charmers-next/ceph-mon - num_units: 3 - options: - monitor-count: '3' - source: *openstack-origin - to: - - '6' - - '7' - - '8' - - rabbitmq-server: - charm: cs:~openstack-charmers-next/rabbitmq-server - num_units: 1 - to: - - '9' - - nova-cloud-controller: - charm: cs:~openstack-charmers-next/nova-cloud-controller - num_units: 1 - options: - openstack-origin: *openstack-origin - network-manager: Neutron - debug: true - to: - - '10' - - placement: - charm: cs:~openstack-charmers-next/placement - num_units: 1 - constraints: mem=1G - options: - openstack-origin: *openstack-origin - to: - - '11' - - neutron-api: - charm: cs:~openstack-charmers-next/neutron-api - num_units: 1 - options: - manage-neutron-plugin-legacy-mode: true - neutron-plugin: ovs - openstack-origin: *openstack-origin - flat-network-providers: physnet1 - neutron-security-groups: true - to: - - '12' - - keystone: - charm: cs:~openstack-charmers-next/keystone - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '13' - - neutron-gateway: - charm: cs:~openstack-charmers-next/neutron-gateway - num_units: 1 - options: - openstack-origin: *openstack-origin - bridge-mappings: physnet1:br-ex - to: - - '14' - - glance: - charm: cs:~openstack-charmers-next/glance - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '15' - - neutron-openvswitch: - charm: cs:~openstack-charmers-next/neutron-openvswitch - - cinder: - charm: cs:~openstack-charmers-next/cinder - num_units: 1 - options: - openstack-origin: *openstack-origin - block-device: None - glance-api-version: 2 - to: - - '16' - - cinder-ceph: - charm: ../../../cinder-ceph - options: - pool-type: erasure-coded - ec-profile-k: 4 - ec-profile-m: 2 - - nova-compute: - charm: cs:~openstack-charmers-next/nova-compute - num_units: 1 - storage: - ephemeral-device: '40G' - options: - openstack-origin: *openstack-origin - config-flags: auto_assign_floating_ip=False - enable-live-migration: false - aa-profile-mode: enforce - debug: true - to: - - '17' - -relations: - - - - 'nova-compute:image-service' - - 'glance:image-service' - - - - 'nova-compute: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' - - - - 'nova-cloud-controller:identity-service' - - 'keystone:identity-service' - - - - 'nova-cloud-controller:amqp' - - 'rabbitmq-server:amqp' - - - - 'nova-cloud-controller:cloud-compute' - - 'nova-compute:cloud-compute' - - - - 'nova-cloud-controller:image-service' - - 'glance:image-service' - - - - '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' - - - - 'keystone:shared-db' - - 'keystone-mysql-router:shared-db' - - - 'keystone-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - - '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' - - - - 'glance:ceph' - - 'ceph-mon:client' - - - - 'neutron-gateway:amqp' - - 'rabbitmq-server:amqp' - - - - 'nova-cloud-controller:quantum-network-service' - - 'neutron-gateway:quantum-network-service' - - - - 'neutron-api:shared-db' - - 'neutron-api-mysql-router:shared-db' - - - 'neutron-api-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - - 'neutron-api:amqp' - - 'rabbitmq-server:amqp' - - - - 'neutron-api:neutron-api' - - 'nova-cloud-controller:neutron-api' - - - - 'neutron-api:identity-service' - - 'keystone:identity-service' - - - - 'nova-compute:neutron-plugin' - - 'neutron-openvswitch:neutron-plugin' - - - - 'rabbitmq-server:amqp' - - 'neutron-openvswitch:amqp' - - - - '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' - - - - 'cinder:image-service' - - 'glance:image-service' - - - - 'cinder-ceph:storage-backend' - - 'cinder:storage-backend' - - - - 'nova-compute:ceph-access' - - 'cinder-ceph:ceph-access' - - - - 'ceph-mon:client' - - 'cinder-ceph:ceph' - - - - 'ceph-mon:osd' - - 'ceph-osd:mon' diff --git a/tests/bundles/focal-ussuri.yaml b/tests/bundles/focal-ussuri.yaml deleted file mode 100644 index 24b6641..0000000 --- a/tests/bundles/focal-ussuri.yaml +++ /dev/null @@ -1,274 +0,0 @@ -variables: - openstack-origin: &openstack-origin distro - -series: &series focal - -machines: - 0: - 1: - 2: - 3: - 4: - 5: - 6: - 7: - 8: - 9: - 10: - 11: - 12: - 13: - 14: - 15: - 16: - # for the nova-compute unit - 17: - constraints: mem=4G cores=4 root-disk=20G - -applications: - - nova-cloud-controller-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router - placement-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router - keystone-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router - glance-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router - neutron-api-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router - cinder-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-osd: - charm: cs:~openstack-charmers-next/ceph-osd - num_units: 3 - storage: - osd-devices: '10G' - options: - osd-devices: '/dev/test-non-existent' - source: *openstack-origin - to: - - '3' - - '4' - - '5' - - ceph-mon: - charm: cs:~openstack-charmers-next/ceph-mon - num_units: 3 - options: - monitor-count: '3' - source: *openstack-origin - to: - - '6' - - '7' - - '8' - - rabbitmq-server: - charm: cs:~openstack-charmers-next/rabbitmq-server - num_units: 1 - to: - - '9' - - nova-cloud-controller: - charm: cs:~openstack-charmers-next/nova-cloud-controller - num_units: 1 - options: - openstack-origin: *openstack-origin - network-manager: Neutron - debug: true - to: - - '10' - - placement: - charm: cs:~openstack-charmers-next/placement - num_units: 1 - constraints: mem=1G - options: - openstack-origin: *openstack-origin - to: - - '11' - - neutron-api: - charm: cs:~openstack-charmers-next/neutron-api - num_units: 1 - options: - manage-neutron-plugin-legacy-mode: true - neutron-plugin: ovs - openstack-origin: *openstack-origin - flat-network-providers: physnet1 - neutron-security-groups: true - to: - - '12' - - keystone: - charm: cs:~openstack-charmers-next/keystone - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '13' - - neutron-gateway: - charm: cs:~openstack-charmers-next/neutron-gateway - num_units: 1 - options: - openstack-origin: *openstack-origin - bridge-mappings: physnet1:br-ex - to: - - '14' - - glance: - charm: cs:~openstack-charmers-next/glance - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '15' - - neutron-openvswitch: - charm: cs:~openstack-charmers-next/neutron-openvswitch - - cinder: - charm: cs:~openstack-charmers-next/cinder - num_units: 1 - options: - openstack-origin: *openstack-origin - block-device: None - glance-api-version: 2 - to: - - '16' - - cinder-ceph: - charm: ../../../cinder-ceph - - nova-compute: - charm: cs:~openstack-charmers-next/nova-compute - num_units: 1 - storage: - ephemeral-device: '40G' - options: - openstack-origin: *openstack-origin - config-flags: auto_assign_floating_ip=False - enable-live-migration: false - aa-profile-mode: enforce - debug: true - to: - - '17' - -relations: - - - - 'nova-compute:image-service' - - 'glance:image-service' - - - - 'nova-compute: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' - - - - 'nova-cloud-controller:identity-service' - - 'keystone:identity-service' - - - - 'nova-cloud-controller:amqp' - - 'rabbitmq-server:amqp' - - - - 'nova-cloud-controller:cloud-compute' - - 'nova-compute:cloud-compute' - - - - 'nova-cloud-controller:image-service' - - 'glance:image-service' - - - - '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' - - - - 'keystone:shared-db' - - 'keystone-mysql-router:shared-db' - - - 'keystone-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - - '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' - - - - 'glance:ceph' - - 'ceph-mon:client' - - - - 'neutron-gateway:amqp' - - 'rabbitmq-server:amqp' - - - - 'nova-cloud-controller:quantum-network-service' - - 'neutron-gateway:quantum-network-service' - - - - 'neutron-api:shared-db' - - 'neutron-api-mysql-router:shared-db' - - - 'neutron-api-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - - 'neutron-api:amqp' - - 'rabbitmq-server:amqp' - - - - 'neutron-api:neutron-api' - - 'nova-cloud-controller:neutron-api' - - - - 'neutron-api:identity-service' - - 'keystone:identity-service' - - - - 'nova-compute:neutron-plugin' - - 'neutron-openvswitch:neutron-plugin' - - - - 'rabbitmq-server:amqp' - - 'neutron-openvswitch:amqp' - - - - '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' - - - - 'cinder:image-service' - - 'glance:image-service' - - - - 'cinder-ceph:storage-backend' - - 'cinder:storage-backend' - - - - 'nova-compute:ceph-access' - - 'cinder-ceph:ceph-access' - - - - 'ceph-mon:client' - - 'cinder-ceph:ceph' - - - - 'ceph-mon:osd' - - 'ceph-osd:mon' diff --git a/tests/bundles/focal-victoria-ec.yaml b/tests/bundles/focal-victoria-ec.yaml deleted file mode 100644 index e76177d..0000000 --- a/tests/bundles/focal-victoria-ec.yaml +++ /dev/null @@ -1,284 +0,0 @@ -variables: - openstack-origin: &openstack-origin cloud:focal-victoria - -series: &series focal - -machines: - 0: - 1: - 2: - 3: - 4: - 5: - 6: - 7: - 8: - 9: - 10: - 11: - 12: - 13: - 14: - 15: - 16: - # for the nova-compute unit - 17: - constraints: mem=4G cores=4 root-disk=20G - 18: - 19: - 20: - -applications: - - nova-cloud-controller-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router - placement-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router - keystone-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router - glance-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router - neutron-api-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router - cinder-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-osd: - charm: cs:~openstack-charmers-next/ceph-osd - num_units: 6 - storage: - osd-devices: '10G' - options: - osd-devices: '/dev/test-non-existent' - source: *openstack-origin - to: - - '3' - - '4' - - '5' - - '18' - - '19' - - '20' - - ceph-mon: - charm: cs:~openstack-charmers-next/ceph-mon - num_units: 3 - options: - monitor-count: '3' - source: *openstack-origin - to: - - '6' - - '7' - - '8' - - rabbitmq-server: - charm: cs:~openstack-charmers-next/rabbitmq-server - num_units: 1 - to: - - '9' - - nova-cloud-controller: - charm: cs:~openstack-charmers-next/nova-cloud-controller - num_units: 1 - options: - openstack-origin: *openstack-origin - network-manager: Neutron - debug: true - to: - - '10' - - placement: - charm: cs:~openstack-charmers-next/placement - num_units: 1 - constraints: mem=1G - options: - openstack-origin: *openstack-origin - to: - - '11' - - neutron-api: - charm: cs:~openstack-charmers-next/neutron-api - num_units: 1 - options: - manage-neutron-plugin-legacy-mode: true - neutron-plugin: ovs - openstack-origin: *openstack-origin - flat-network-providers: physnet1 - neutron-security-groups: true - to: - - '12' - - keystone: - charm: cs:~openstack-charmers-next/keystone - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '13' - - neutron-gateway: - charm: cs:~openstack-charmers-next/neutron-gateway - num_units: 1 - options: - openstack-origin: *openstack-origin - bridge-mappings: physnet1:br-ex - to: - - '14' - - glance: - charm: cs:~openstack-charmers-next/glance - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '15' - - neutron-openvswitch: - charm: cs:~openstack-charmers-next/neutron-openvswitch - - cinder: - charm: cs:~openstack-charmers-next/cinder - num_units: 1 - options: - openstack-origin: *openstack-origin - block-device: None - glance-api-version: 2 - to: - - '16' - - cinder-ceph: - charm: ../../../cinder-ceph - options: - pool-type: erasure-coded - ec-profile-k: 4 - ec-profile-m: 2 - - nova-compute: - charm: cs:~openstack-charmers-next/nova-compute - num_units: 1 - storage: - ephemeral-device: '40G' - options: - openstack-origin: *openstack-origin - config-flags: auto_assign_floating_ip=False - enable-live-migration: false - aa-profile-mode: enforce - debug: true - to: - - '17' - -relations: - - - - 'nova-compute:image-service' - - 'glance:image-service' - - - - 'nova-compute: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' - - - - 'nova-cloud-controller:identity-service' - - 'keystone:identity-service' - - - - 'nova-cloud-controller:amqp' - - 'rabbitmq-server:amqp' - - - - 'nova-cloud-controller:cloud-compute' - - 'nova-compute:cloud-compute' - - - - 'nova-cloud-controller:image-service' - - 'glance:image-service' - - - - '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' - - - - 'keystone:shared-db' - - 'keystone-mysql-router:shared-db' - - - 'keystone-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - - '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' - - - - 'glance:ceph' - - 'ceph-mon:client' - - - - 'neutron-gateway:amqp' - - 'rabbitmq-server:amqp' - - - - 'nova-cloud-controller:quantum-network-service' - - 'neutron-gateway:quantum-network-service' - - - - 'neutron-api:shared-db' - - 'neutron-api-mysql-router:shared-db' - - - 'neutron-api-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - - 'neutron-api:amqp' - - 'rabbitmq-server:amqp' - - - - 'neutron-api:neutron-api' - - 'nova-cloud-controller:neutron-api' - - - - 'neutron-api:identity-service' - - 'keystone:identity-service' - - - - 'nova-compute:neutron-plugin' - - 'neutron-openvswitch:neutron-plugin' - - - - 'rabbitmq-server:amqp' - - 'neutron-openvswitch:amqp' - - - - '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' - - - - 'cinder:image-service' - - 'glance:image-service' - - - - 'cinder-ceph:storage-backend' - - 'cinder:storage-backend' - - - - 'nova-compute:ceph-access' - - 'cinder-ceph:ceph-access' - - - - 'ceph-mon:client' - - 'cinder-ceph:ceph' - - - - 'ceph-mon:osd' - - 'ceph-osd:mon' diff --git a/tests/bundles/focal-victoria.yaml b/tests/bundles/focal-victoria.yaml deleted file mode 100644 index a3dfdb2..0000000 --- a/tests/bundles/focal-victoria.yaml +++ /dev/null @@ -1,274 +0,0 @@ -variables: - openstack-origin: &openstack-origin cloud:focal-victoria - -series: &series focal - -machines: - 0: - 1: - 2: - 3: - 4: - 5: - 6: - 7: - 8: - 9: - 10: - 11: - 12: - 13: - 14: - 15: - 16: - # for the nova-compute unit - 17: - constraints: mem=4G cores=4 root-disk=20G - -applications: - - nova-cloud-controller-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router - placement-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router - keystone-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router - glance-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router - neutron-api-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router - cinder-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-osd: - charm: cs:~openstack-charmers-next/ceph-osd - num_units: 3 - storage: - osd-devices: '10G' - options: - osd-devices: '/dev/test-non-existent' - source: *openstack-origin - to: - - '3' - - '4' - - '5' - - ceph-mon: - charm: cs:~openstack-charmers-next/ceph-mon - num_units: 3 - options: - monitor-count: '3' - source: *openstack-origin - to: - - '6' - - '7' - - '8' - - rabbitmq-server: - charm: cs:~openstack-charmers-next/rabbitmq-server - num_units: 1 - to: - - '9' - - nova-cloud-controller: - charm: cs:~openstack-charmers-next/nova-cloud-controller - num_units: 1 - options: - openstack-origin: *openstack-origin - network-manager: Neutron - debug: true - to: - - '10' - - placement: - charm: cs:~openstack-charmers-next/placement - num_units: 1 - constraints: mem=1G - options: - openstack-origin: *openstack-origin - to: - - '11' - - neutron-api: - charm: cs:~openstack-charmers-next/neutron-api - num_units: 1 - options: - manage-neutron-plugin-legacy-mode: true - neutron-plugin: ovs - openstack-origin: *openstack-origin - flat-network-providers: physnet1 - neutron-security-groups: true - to: - - '12' - - keystone: - charm: cs:~openstack-charmers-next/keystone - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '13' - - neutron-gateway: - charm: cs:~openstack-charmers-next/neutron-gateway - num_units: 1 - options: - openstack-origin: *openstack-origin - bridge-mappings: physnet1:br-ex - to: - - '14' - - glance: - charm: cs:~openstack-charmers-next/glance - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '15' - - neutron-openvswitch: - charm: cs:~openstack-charmers-next/neutron-openvswitch - - cinder: - charm: cs:~openstack-charmers-next/cinder - num_units: 1 - options: - openstack-origin: *openstack-origin - block-device: None - glance-api-version: 2 - to: - - '16' - - cinder-ceph: - charm: ../../../cinder-ceph - - nova-compute: - charm: cs:~openstack-charmers-next/nova-compute - num_units: 1 - storage: - ephemeral-device: '40G' - options: - openstack-origin: *openstack-origin - config-flags: auto_assign_floating_ip=False - enable-live-migration: false - aa-profile-mode: enforce - debug: true - to: - - '17' - -relations: - - - - 'nova-compute:image-service' - - 'glance:image-service' - - - - 'nova-compute: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' - - - - 'nova-cloud-controller:identity-service' - - 'keystone:identity-service' - - - - 'nova-cloud-controller:amqp' - - 'rabbitmq-server:amqp' - - - - 'nova-cloud-controller:cloud-compute' - - 'nova-compute:cloud-compute' - - - - 'nova-cloud-controller:image-service' - - 'glance:image-service' - - - - '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' - - - - 'keystone:shared-db' - - 'keystone-mysql-router:shared-db' - - - 'keystone-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - - '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' - - - - 'glance:ceph' - - 'ceph-mon:client' - - - - 'neutron-gateway:amqp' - - 'rabbitmq-server:amqp' - - - - 'nova-cloud-controller:quantum-network-service' - - 'neutron-gateway:quantum-network-service' - - - - 'neutron-api:shared-db' - - 'neutron-api-mysql-router:shared-db' - - - 'neutron-api-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - - 'neutron-api:amqp' - - 'rabbitmq-server:amqp' - - - - 'neutron-api:neutron-api' - - 'nova-cloud-controller:neutron-api' - - - - 'neutron-api:identity-service' - - 'keystone:identity-service' - - - - 'nova-compute:neutron-plugin' - - 'neutron-openvswitch:neutron-plugin' - - - - 'rabbitmq-server:amqp' - - 'neutron-openvswitch:amqp' - - - - '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' - - - - 'cinder:image-service' - - 'glance:image-service' - - - - 'cinder-ceph:storage-backend' - - 'cinder:storage-backend' - - - - 'nova-compute:ceph-access' - - 'cinder-ceph:ceph-access' - - - - 'ceph-mon:client' - - 'cinder-ceph:ceph' - - - - 'ceph-mon:osd' - - 'ceph-osd:mon' diff --git a/tests/bundles/focal-wallaby-ec.yaml b/tests/bundles/focal-wallaby-ec.yaml deleted file mode 100644 index 768fdca..0000000 --- a/tests/bundles/focal-wallaby-ec.yaml +++ /dev/null @@ -1,284 +0,0 @@ -variables: - openstack-origin: &openstack-origin cloud:focal-wallaby - -series: &series focal - -machines: - 0: - 1: - 2: - 3: - 4: - 5: - 6: - 7: - 8: - 9: - 10: - 11: - 12: - 13: - 14: - 15: - 16: - # for the nova-compute unit - 17: - constraints: mem=4G cores=4 root-disk=20G - 18: - 19: - 20: - -applications: - - nova-cloud-controller-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router - placement-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router - keystone-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router - glance-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router - neutron-api-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router - cinder-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-osd: - charm: cs:~openstack-charmers-next/ceph-osd - num_units: 6 - storage: - osd-devices: '10G' - options: - osd-devices: '/dev/test-non-existent' - source: *openstack-origin - to: - - '3' - - '4' - - '5' - - '18' - - '19' - - '20' - - ceph-mon: - charm: cs:~openstack-charmers-next/ceph-mon - num_units: 3 - options: - monitor-count: '3' - source: *openstack-origin - to: - - '6' - - '7' - - '8' - - rabbitmq-server: - charm: cs:~openstack-charmers-next/rabbitmq-server - num_units: 1 - to: - - '9' - - nova-cloud-controller: - charm: cs:~openstack-charmers-next/nova-cloud-controller - num_units: 1 - options: - openstack-origin: *openstack-origin - network-manager: Neutron - debug: true - to: - - '10' - - placement: - charm: cs:~openstack-charmers-next/placement - num_units: 1 - constraints: mem=1G - options: - openstack-origin: *openstack-origin - to: - - '11' - - neutron-api: - charm: cs:~openstack-charmers-next/neutron-api - num_units: 1 - options: - manage-neutron-plugin-legacy-mode: true - neutron-plugin: ovs - openstack-origin: *openstack-origin - flat-network-providers: physnet1 - neutron-security-groups: true - to: - - '12' - - keystone: - charm: cs:~openstack-charmers-next/keystone - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '13' - - neutron-gateway: - charm: cs:~openstack-charmers-next/neutron-gateway - num_units: 1 - options: - openstack-origin: *openstack-origin - bridge-mappings: physnet1:br-ex - to: - - '14' - - glance: - charm: cs:~openstack-charmers-next/glance - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '15' - - neutron-openvswitch: - charm: cs:~openstack-charmers-next/neutron-openvswitch - - cinder: - charm: cs:~openstack-charmers-next/cinder - num_units: 1 - options: - openstack-origin: *openstack-origin - block-device: None - glance-api-version: 2 - to: - - '16' - - cinder-ceph: - charm: ../../../cinder-ceph - options: - pool-type: erasure-coded - ec-profile-k: 4 - ec-profile-m: 2 - - nova-compute: - charm: cs:~openstack-charmers-next/nova-compute - num_units: 1 - storage: - ephemeral-device: '40G' - options: - openstack-origin: *openstack-origin - config-flags: auto_assign_floating_ip=False - enable-live-migration: false - aa-profile-mode: enforce - debug: true - to: - - '17' - -relations: - - - - 'nova-compute:image-service' - - 'glance:image-service' - - - - 'nova-compute: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' - - - - 'nova-cloud-controller:identity-service' - - 'keystone:identity-service' - - - - 'nova-cloud-controller:amqp' - - 'rabbitmq-server:amqp' - - - - 'nova-cloud-controller:cloud-compute' - - 'nova-compute:cloud-compute' - - - - 'nova-cloud-controller:image-service' - - 'glance:image-service' - - - - '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' - - - - 'keystone:shared-db' - - 'keystone-mysql-router:shared-db' - - - 'keystone-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - - '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' - - - - 'glance:ceph' - - 'ceph-mon:client' - - - - 'neutron-gateway:amqp' - - 'rabbitmq-server:amqp' - - - - 'nova-cloud-controller:quantum-network-service' - - 'neutron-gateway:quantum-network-service' - - - - 'neutron-api:shared-db' - - 'neutron-api-mysql-router:shared-db' - - - 'neutron-api-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - - 'neutron-api:amqp' - - 'rabbitmq-server:amqp' - - - - 'neutron-api:neutron-api' - - 'nova-cloud-controller:neutron-api' - - - - 'neutron-api:identity-service' - - 'keystone:identity-service' - - - - 'nova-compute:neutron-plugin' - - 'neutron-openvswitch:neutron-plugin' - - - - 'rabbitmq-server:amqp' - - 'neutron-openvswitch:amqp' - - - - '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' - - - - 'cinder:image-service' - - 'glance:image-service' - - - - 'cinder-ceph:storage-backend' - - 'cinder:storage-backend' - - - - 'nova-compute:ceph-access' - - 'cinder-ceph:ceph-access' - - - - 'ceph-mon:client' - - 'cinder-ceph:ceph' - - - - 'ceph-mon:osd' - - 'ceph-osd:mon' diff --git a/tests/bundles/focal-wallaby.yaml b/tests/bundles/focal-wallaby.yaml deleted file mode 100644 index e651c96..0000000 --- a/tests/bundles/focal-wallaby.yaml +++ /dev/null @@ -1,274 +0,0 @@ -variables: - openstack-origin: &openstack-origin cloud:focal-wallaby - -series: &series focal - -machines: - 0: - 1: - 2: - 3: - 4: - 5: - 6: - 7: - 8: - 9: - 10: - 11: - 12: - 13: - 14: - 15: - 16: - # for the nova-compute unit - 17: - constraints: mem=4G cores=4 root-disk=20G - -applications: - - nova-cloud-controller-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router - placement-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router - keystone-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router - glance-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router - neutron-api-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router - cinder-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-osd: - charm: cs:~openstack-charmers-next/ceph-osd - num_units: 3 - storage: - osd-devices: '10G' - options: - osd-devices: '/dev/test-non-existent' - source: *openstack-origin - to: - - '3' - - '4' - - '5' - - ceph-mon: - charm: cs:~openstack-charmers-next/ceph-mon - num_units: 3 - options: - monitor-count: '3' - source: *openstack-origin - to: - - '6' - - '7' - - '8' - - rabbitmq-server: - charm: cs:~openstack-charmers-next/rabbitmq-server - num_units: 1 - to: - - '9' - - nova-cloud-controller: - charm: cs:~openstack-charmers-next/nova-cloud-controller - num_units: 1 - options: - openstack-origin: *openstack-origin - network-manager: Neutron - debug: true - to: - - '10' - - placement: - charm: cs:~openstack-charmers-next/placement - num_units: 1 - constraints: mem=1G - options: - openstack-origin: *openstack-origin - to: - - '11' - - neutron-api: - charm: cs:~openstack-charmers-next/neutron-api - num_units: 1 - options: - manage-neutron-plugin-legacy-mode: true - neutron-plugin: ovs - openstack-origin: *openstack-origin - flat-network-providers: physnet1 - neutron-security-groups: true - to: - - '12' - - keystone: - charm: cs:~openstack-charmers-next/keystone - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '13' - - neutron-gateway: - charm: cs:~openstack-charmers-next/neutron-gateway - num_units: 1 - options: - openstack-origin: *openstack-origin - bridge-mappings: physnet1:br-ex - to: - - '14' - - glance: - charm: cs:~openstack-charmers-next/glance - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '15' - - neutron-openvswitch: - charm: cs:~openstack-charmers-next/neutron-openvswitch - - cinder: - charm: cs:~openstack-charmers-next/cinder - num_units: 1 - options: - openstack-origin: *openstack-origin - block-device: None - glance-api-version: 2 - to: - - '16' - - cinder-ceph: - charm: ../../../cinder-ceph - - nova-compute: - charm: cs:~openstack-charmers-next/nova-compute - num_units: 1 - storage: - ephemeral-device: '40G' - options: - openstack-origin: *openstack-origin - config-flags: auto_assign_floating_ip=False - enable-live-migration: false - aa-profile-mode: enforce - debug: true - to: - - '17' - -relations: - - - - 'nova-compute:image-service' - - 'glance:image-service' - - - - 'nova-compute: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' - - - - 'nova-cloud-controller:identity-service' - - 'keystone:identity-service' - - - - 'nova-cloud-controller:amqp' - - 'rabbitmq-server:amqp' - - - - 'nova-cloud-controller:cloud-compute' - - 'nova-compute:cloud-compute' - - - - 'nova-cloud-controller:image-service' - - 'glance:image-service' - - - - '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' - - - - 'keystone:shared-db' - - 'keystone-mysql-router:shared-db' - - - 'keystone-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - - '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' - - - - 'glance:ceph' - - 'ceph-mon:client' - - - - 'neutron-gateway:amqp' - - 'rabbitmq-server:amqp' - - - - 'nova-cloud-controller:quantum-network-service' - - 'neutron-gateway:quantum-network-service' - - - - 'neutron-api:shared-db' - - 'neutron-api-mysql-router:shared-db' - - - 'neutron-api-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - - 'neutron-api:amqp' - - 'rabbitmq-server:amqp' - - - - 'neutron-api:neutron-api' - - 'nova-cloud-controller:neutron-api' - - - - 'neutron-api:identity-service' - - 'keystone:identity-service' - - - - 'nova-compute:neutron-plugin' - - 'neutron-openvswitch:neutron-plugin' - - - - 'rabbitmq-server:amqp' - - 'neutron-openvswitch:amqp' - - - - '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' - - - - 'cinder:image-service' - - 'glance:image-service' - - - - 'cinder-ceph:storage-backend' - - 'cinder:storage-backend' - - - - 'nova-compute:ceph-access' - - 'cinder-ceph:ceph-access' - - - - 'ceph-mon:client' - - 'cinder-ceph:ceph' - - - - 'ceph-mon:osd' - - 'ceph-osd:mon' diff --git a/tests/bundles/focal-xena-ec.yaml b/tests/bundles/focal-xena-ec.yaml index 4077de3..e30f203 100644 --- a/tests/bundles/focal-xena-ec.yaml +++ b/tests/bundles/focal-xena-ec.yaml @@ -31,20 +31,26 @@ machines: applications: nova-cloud-controller-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 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 neutron-api-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 mysql-innodb-cluster: - charm: cs:~openstack-charmers-next/mysql-innodb-cluster + charm: ch:mysql-innodb-cluster num_units: 3 options: source: *openstack-origin @@ -52,9 +58,10 @@ applications: - '0' - '1' - '2' + channel: latest/edge ceph-osd: - charm: cs:~openstack-charmers-next/ceph-osd + charm: ch:ceph-osd num_units: 6 storage: osd-devices: '10G' @@ -68,9 +75,10 @@ applications: - '18' - '19' - '20' + channel: latest/edge ceph-mon: - charm: cs:~openstack-charmers-next/ceph-mon + charm: ch:ceph-mon num_units: 3 options: monitor-count: '3' @@ -79,15 +87,17 @@ applications: - '6' - '7' - '8' + channel: latest/edge rabbitmq-server: - charm: cs:~openstack-charmers-next/rabbitmq-server + charm: ch:rabbitmq-server num_units: 1 to: - '9' + 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 @@ -95,18 +105,20 @@ applications: debug: true to: - '10' + 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: - '11' + channel: latest/edge neutron-api: - charm: cs:~openstack-charmers-next/neutron-api + charm: ch:neutron-api num_units: 1 options: manage-neutron-plugin-legacy-mode: true @@ -116,37 +128,42 @@ applications: neutron-security-groups: true to: - '12' + channel: latest/edge keystone: - charm: cs:~openstack-charmers-next/keystone + charm: ch:keystone num_units: 1 options: openstack-origin: *openstack-origin to: - '13' + channel: latest/edge neutron-gateway: - charm: cs:~openstack-charmers-next/neutron-gateway + charm: ch:neutron-gateway num_units: 1 options: openstack-origin: *openstack-origin bridge-mappings: physnet1:br-ex to: - '14' + channel: latest/edge glance: - charm: cs:~openstack-charmers-next/glance + charm: ch:glance num_units: 1 options: openstack-origin: *openstack-origin to: - '15' + channel: latest/edge neutron-openvswitch: - charm: cs:~openstack-charmers-next/neutron-openvswitch + charm: ch:neutron-openvswitch + channel: latest/edge cinder: - charm: cs:~openstack-charmers-next/cinder + charm: ch:cinder num_units: 1 options: openstack-origin: *openstack-origin @@ -154,6 +171,7 @@ applications: glance-api-version: 2 to: - '16' + channel: latest/edge cinder-ceph: charm: ../../../cinder-ceph @@ -163,7 +181,7 @@ applications: ec-profile-m: 2 nova-compute: - charm: cs:~openstack-charmers-next/nova-compute + charm: ch:nova-compute num_units: 1 storage: ephemeral-device: '40G' @@ -175,6 +193,7 @@ applications: debug: true to: - '17' + channel: latest/edge relations: diff --git a/tests/bundles/focal-xena.yaml b/tests/bundles/focal-xena.yaml index b5b4730..d21a351 100644 --- a/tests/bundles/focal-xena.yaml +++ b/tests/bundles/focal-xena.yaml @@ -28,20 +28,26 @@ machines: applications: nova-cloud-controller-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 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 neutron-api-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 mysql-innodb-cluster: - charm: cs:~openstack-charmers-next/mysql-innodb-cluster + charm: ch:mysql-innodb-cluster num_units: 3 options: source: *openstack-origin @@ -49,9 +55,10 @@ applications: - '0' - '1' - '2' + channel: latest/edge ceph-osd: - charm: cs:~openstack-charmers-next/ceph-osd + charm: ch:ceph-osd num_units: 3 storage: osd-devices: '10G' @@ -62,9 +69,10 @@ applications: - '3' - '4' - '5' + channel: latest/edge ceph-mon: - charm: cs:~openstack-charmers-next/ceph-mon + charm: ch:ceph-mon num_units: 3 options: monitor-count: '3' @@ -73,15 +81,17 @@ applications: - '6' - '7' - '8' + channel: latest/edge rabbitmq-server: - charm: cs:~openstack-charmers-next/rabbitmq-server + charm: ch:rabbitmq-server num_units: 1 to: - '9' + 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 @@ -89,18 +99,20 @@ applications: debug: true to: - '10' + 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: - '11' + channel: latest/edge neutron-api: - charm: cs:~openstack-charmers-next/neutron-api + charm: ch:neutron-api num_units: 1 options: manage-neutron-plugin-legacy-mode: true @@ -110,37 +122,42 @@ applications: neutron-security-groups: true to: - '12' + channel: latest/edge keystone: - charm: cs:~openstack-charmers-next/keystone + charm: ch:keystone num_units: 1 options: openstack-origin: *openstack-origin to: - '13' + channel: latest/edge neutron-gateway: - charm: cs:~openstack-charmers-next/neutron-gateway + charm: ch:neutron-gateway num_units: 1 options: openstack-origin: *openstack-origin bridge-mappings: physnet1:br-ex to: - '14' + channel: latest/edge glance: - charm: cs:~openstack-charmers-next/glance + charm: ch:glance num_units: 1 options: openstack-origin: *openstack-origin to: - '15' + channel: latest/edge neutron-openvswitch: - charm: cs:~openstack-charmers-next/neutron-openvswitch + charm: ch:neutron-openvswitch + channel: latest/edge cinder: - charm: cs:~openstack-charmers-next/cinder + charm: ch:cinder num_units: 1 options: openstack-origin: *openstack-origin @@ -148,12 +165,13 @@ applications: glance-api-version: 2 to: - '16' + channel: latest/edge cinder-ceph: charm: ../../../cinder-ceph nova-compute: - charm: cs:~openstack-charmers-next/nova-compute + charm: ch:nova-compute num_units: 1 storage: ephemeral-device: '40G' @@ -165,6 +183,7 @@ applications: debug: true to: - '17' + channel: latest/edge relations: diff --git a/tests/bundles/focal-yoga-ec.yaml b/tests/bundles/focal-yoga-ec.yaml index 7890a1d..10b3b4a 100644 --- a/tests/bundles/focal-yoga-ec.yaml +++ b/tests/bundles/focal-yoga-ec.yaml @@ -31,20 +31,26 @@ machines: applications: nova-cloud-controller-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 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 neutron-api-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 mysql-innodb-cluster: - charm: cs:~openstack-charmers-next/mysql-innodb-cluster + charm: ch:mysql-innodb-cluster num_units: 3 options: source: *openstack-origin @@ -52,9 +58,10 @@ applications: - '0' - '1' - '2' + channel: latest/edge ceph-osd: - charm: cs:~openstack-charmers-next/ceph-osd + charm: ch:ceph-osd num_units: 6 storage: osd-devices: '10G' @@ -68,9 +75,10 @@ applications: - '18' - '19' - '20' + channel: latest/edge ceph-mon: - charm: cs:~openstack-charmers-next/ceph-mon + charm: ch:ceph-mon num_units: 3 options: monitor-count: '3' @@ -79,15 +87,17 @@ applications: - '6' - '7' - '8' + channel: latest/edge rabbitmq-server: - charm: cs:~openstack-charmers-next/rabbitmq-server + charm: ch:rabbitmq-server num_units: 1 to: - '9' + 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 @@ -95,18 +105,20 @@ applications: debug: true to: - '10' + 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: - '11' + channel: latest/edge neutron-api: - charm: cs:~openstack-charmers-next/neutron-api + charm: ch:neutron-api num_units: 1 options: manage-neutron-plugin-legacy-mode: true @@ -116,37 +128,42 @@ applications: neutron-security-groups: true to: - '12' + channel: latest/edge keystone: - charm: cs:~openstack-charmers-next/keystone + charm: ch:keystone num_units: 1 options: openstack-origin: *openstack-origin to: - '13' + channel: latest/edge neutron-gateway: - charm: cs:~openstack-charmers-next/neutron-gateway + charm: ch:neutron-gateway num_units: 1 options: openstack-origin: *openstack-origin bridge-mappings: physnet1:br-ex to: - '14' + channel: latest/edge glance: - charm: cs:~openstack-charmers-next/glance + charm: ch:glance num_units: 1 options: openstack-origin: *openstack-origin to: - '15' + channel: latest/edge neutron-openvswitch: - charm: cs:~openstack-charmers-next/neutron-openvswitch + charm: ch:neutron-openvswitch + channel: latest/edge cinder: - charm: cs:~openstack-charmers-next/cinder + charm: ch:cinder num_units: 1 options: openstack-origin: *openstack-origin @@ -154,6 +171,7 @@ applications: glance-api-version: 2 to: - '16' + channel: latest/edge cinder-ceph: charm: ../../../cinder-ceph @@ -163,7 +181,7 @@ applications: ec-profile-m: 2 nova-compute: - charm: cs:~openstack-charmers-next/nova-compute + charm: ch:nova-compute num_units: 1 storage: ephemeral-device: '40G' @@ -175,6 +193,7 @@ applications: debug: true to: - '17' + channel: latest/edge relations: diff --git a/tests/bundles/focal-yoga.yaml b/tests/bundles/focal-yoga.yaml index 8163bce..f5b5b62 100644 --- a/tests/bundles/focal-yoga.yaml +++ b/tests/bundles/focal-yoga.yaml @@ -28,20 +28,26 @@ machines: applications: nova-cloud-controller-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 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 neutron-api-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 mysql-innodb-cluster: - charm: cs:~openstack-charmers-next/mysql-innodb-cluster + charm: ch:mysql-innodb-cluster num_units: 3 options: source: *openstack-origin @@ -49,9 +55,10 @@ applications: - '0' - '1' - '2' + channel: latest/edge ceph-osd: - charm: cs:~openstack-charmers-next/ceph-osd + charm: ch:ceph-osd num_units: 3 storage: osd-devices: '10G' @@ -62,9 +69,10 @@ applications: - '3' - '4' - '5' + channel: latest/edge ceph-mon: - charm: cs:~openstack-charmers-next/ceph-mon + charm: ch:ceph-mon num_units: 3 options: monitor-count: '3' @@ -73,15 +81,17 @@ applications: - '6' - '7' - '8' + channel: latest/edge rabbitmq-server: - charm: cs:~openstack-charmers-next/rabbitmq-server + charm: ch:rabbitmq-server num_units: 1 to: - '9' + 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 @@ -89,18 +99,20 @@ applications: debug: true to: - '10' + 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: - '11' + channel: latest/edge neutron-api: - charm: cs:~openstack-charmers-next/neutron-api + charm: ch:neutron-api num_units: 1 options: manage-neutron-plugin-legacy-mode: true @@ -110,37 +122,42 @@ applications: neutron-security-groups: true to: - '12' + channel: latest/edge keystone: - charm: cs:~openstack-charmers-next/keystone + charm: ch:keystone num_units: 1 options: openstack-origin: *openstack-origin to: - '13' + channel: latest/edge neutron-gateway: - charm: cs:~openstack-charmers-next/neutron-gateway + charm: ch:neutron-gateway num_units: 1 options: openstack-origin: *openstack-origin bridge-mappings: physnet1:br-ex to: - '14' + channel: latest/edge glance: - charm: cs:~openstack-charmers-next/glance + charm: ch:glance num_units: 1 options: openstack-origin: *openstack-origin to: - '15' + channel: latest/edge neutron-openvswitch: - charm: cs:~openstack-charmers-next/neutron-openvswitch + charm: ch:neutron-openvswitch + channel: latest/edge cinder: - charm: cs:~openstack-charmers-next/cinder + charm: ch:cinder num_units: 1 options: openstack-origin: *openstack-origin @@ -148,12 +165,13 @@ applications: glance-api-version: 2 to: - '16' + channel: latest/edge cinder-ceph: charm: ../../../cinder-ceph nova-compute: - charm: cs:~openstack-charmers-next/nova-compute + charm: ch:nova-compute num_units: 1 storage: ephemeral-device: '40G' @@ -165,6 +183,7 @@ applications: debug: true to: - '17' + channel: latest/edge relations: diff --git a/tests/bundles/hirsute-wallaby-ec.yaml b/tests/bundles/hirsute-wallaby-ec.yaml deleted file mode 100644 index dbdce7e..0000000 --- a/tests/bundles/hirsute-wallaby-ec.yaml +++ /dev/null @@ -1,284 +0,0 @@ -variables: - openstack-origin: &openstack-origin distro - -series: &series hirsute - -machines: - 0: - 1: - 2: - 3: - 4: - 5: - 6: - 7: - 8: - 9: - 10: - 11: - 12: - 13: - 14: - 15: - 16: - # for the nova-compute unit - 17: - constraints: mem=4G cores=4 root-disk=20G - 18: - 19: - 20: - -applications: - - nova-cloud-controller-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router - placement-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router - keystone-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router - glance-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router - neutron-api-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router - cinder-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-osd: - charm: cs:~openstack-charmers-next/ceph-osd - num_units: 6 - storage: - osd-devices: '10G' - options: - osd-devices: '/dev/test-non-existent' - source: *openstack-origin - to: - - '3' - - '4' - - '5' - - '18' - - '19' - - '20' - - ceph-mon: - charm: cs:~openstack-charmers-next/ceph-mon - num_units: 3 - options: - monitor-count: '3' - source: *openstack-origin - to: - - '6' - - '7' - - '8' - - rabbitmq-server: - charm: cs:~openstack-charmers-next/rabbitmq-server - num_units: 1 - to: - - '9' - - nova-cloud-controller: - charm: cs:~openstack-charmers-next/nova-cloud-controller - num_units: 1 - options: - openstack-origin: *openstack-origin - network-manager: Neutron - debug: true - to: - - '10' - - placement: - charm: cs:~openstack-charmers-next/placement - num_units: 1 - constraints: mem=1G - options: - openstack-origin: *openstack-origin - to: - - '11' - - neutron-api: - charm: cs:~openstack-charmers-next/neutron-api - num_units: 1 - options: - manage-neutron-plugin-legacy-mode: true - neutron-plugin: ovs - openstack-origin: *openstack-origin - flat-network-providers: physnet1 - neutron-security-groups: true - to: - - '12' - - keystone: - charm: cs:~openstack-charmers-next/keystone - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '13' - - neutron-gateway: - charm: cs:~openstack-charmers-next/neutron-gateway - num_units: 1 - options: - openstack-origin: *openstack-origin - bridge-mappings: physnet1:br-ex - to: - - '14' - - glance: - charm: cs:~openstack-charmers-next/glance - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '15' - - neutron-openvswitch: - charm: cs:~openstack-charmers-next/neutron-openvswitch - - cinder: - charm: cs:~openstack-charmers-next/cinder - num_units: 1 - options: - openstack-origin: *openstack-origin - block-device: None - glance-api-version: 2 - to: - - '16' - - cinder-ceph: - charm: ../../../cinder-ceph - options: - pool-type: erasure-coded - ec-profile-k: 4 - ec-profile-m: 2 - - nova-compute: - charm: cs:~openstack-charmers-next/nova-compute - num_units: 1 - storage: - ephemeral-device: '40G' - options: - openstack-origin: *openstack-origin - config-flags: auto_assign_floating_ip=False - enable-live-migration: false - aa-profile-mode: enforce - debug: true - to: - - '17' - -relations: - - - - 'nova-compute:image-service' - - 'glance:image-service' - - - - 'nova-compute: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' - - - - 'nova-cloud-controller:identity-service' - - 'keystone:identity-service' - - - - 'nova-cloud-controller:amqp' - - 'rabbitmq-server:amqp' - - - - 'nova-cloud-controller:cloud-compute' - - 'nova-compute:cloud-compute' - - - - 'nova-cloud-controller:image-service' - - 'glance:image-service' - - - - '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' - - - - 'keystone:shared-db' - - 'keystone-mysql-router:shared-db' - - - 'keystone-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - - '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' - - - - 'glance:ceph' - - 'ceph-mon:client' - - - - 'neutron-gateway:amqp' - - 'rabbitmq-server:amqp' - - - - 'nova-cloud-controller:quantum-network-service' - - 'neutron-gateway:quantum-network-service' - - - - 'neutron-api:shared-db' - - 'neutron-api-mysql-router:shared-db' - - - 'neutron-api-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - - 'neutron-api:amqp' - - 'rabbitmq-server:amqp' - - - - 'neutron-api:neutron-api' - - 'nova-cloud-controller:neutron-api' - - - - 'neutron-api:identity-service' - - 'keystone:identity-service' - - - - 'nova-compute:neutron-plugin' - - 'neutron-openvswitch:neutron-plugin' - - - - 'rabbitmq-server:amqp' - - 'neutron-openvswitch:amqp' - - - - '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' - - - - 'cinder:image-service' - - 'glance:image-service' - - - - 'cinder-ceph:storage-backend' - - 'cinder:storage-backend' - - - - 'nova-compute:ceph-access' - - 'cinder-ceph:ceph-access' - - - - 'ceph-mon:client' - - 'cinder-ceph:ceph' - - - - 'ceph-mon:osd' - - 'ceph-osd:mon' diff --git a/tests/bundles/hirsute-wallaby.yaml b/tests/bundles/hirsute-wallaby.yaml deleted file mode 100644 index bf9cf6f..0000000 --- a/tests/bundles/hirsute-wallaby.yaml +++ /dev/null @@ -1,274 +0,0 @@ -variables: - openstack-origin: &openstack-origin distro - -series: &series hirsute - -machines: - 0: - 1: - 2: - 3: - 4: - 5: - 6: - 7: - 8: - 9: - 10: - 11: - 12: - 13: - 14: - 15: - 16: - # for the nova-compute unit - 17: - constraints: mem=4G cores=4 root-disk=20G - -applications: - - nova-cloud-controller-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router - placement-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router - keystone-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router - glance-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router - neutron-api-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router - cinder-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-osd: - charm: cs:~openstack-charmers-next/ceph-osd - num_units: 3 - storage: - osd-devices: '10G' - options: - osd-devices: '/dev/test-non-existent' - source: *openstack-origin - to: - - '3' - - '4' - - '5' - - ceph-mon: - charm: cs:~openstack-charmers-next/ceph-mon - num_units: 3 - options: - monitor-count: '3' - source: *openstack-origin - to: - - '6' - - '7' - - '8' - - rabbitmq-server: - charm: cs:~openstack-charmers-next/rabbitmq-server - num_units: 1 - to: - - '9' - - nova-cloud-controller: - charm: cs:~openstack-charmers-next/nova-cloud-controller - num_units: 1 - options: - openstack-origin: *openstack-origin - network-manager: Neutron - debug: true - to: - - '10' - - placement: - charm: cs:~openstack-charmers-next/placement - num_units: 1 - constraints: mem=1G - options: - openstack-origin: *openstack-origin - to: - - '11' - - neutron-api: - charm: cs:~openstack-charmers-next/neutron-api - num_units: 1 - options: - manage-neutron-plugin-legacy-mode: true - neutron-plugin: ovs - openstack-origin: *openstack-origin - flat-network-providers: physnet1 - neutron-security-groups: true - to: - - '12' - - keystone: - charm: cs:~openstack-charmers-next/keystone - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '13' - - neutron-gateway: - charm: cs:~openstack-charmers-next/neutron-gateway - num_units: 1 - options: - openstack-origin: *openstack-origin - bridge-mappings: physnet1:br-ex - to: - - '14' - - glance: - charm: cs:~openstack-charmers-next/glance - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '15' - - neutron-openvswitch: - charm: cs:~openstack-charmers-next/neutron-openvswitch - - cinder: - charm: cs:~openstack-charmers-next/cinder - num_units: 1 - options: - openstack-origin: *openstack-origin - block-device: None - glance-api-version: 2 - to: - - '16' - - cinder-ceph: - charm: ../../../cinder-ceph - - nova-compute: - charm: cs:~openstack-charmers-next/nova-compute - num_units: 1 - storage: - ephemeral-device: '40G' - options: - openstack-origin: *openstack-origin - config-flags: auto_assign_floating_ip=False - enable-live-migration: false - aa-profile-mode: enforce - debug: true - to: - - '17' - -relations: - - - - 'nova-compute:image-service' - - 'glance:image-service' - - - - 'nova-compute: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' - - - - 'nova-cloud-controller:identity-service' - - 'keystone:identity-service' - - - - 'nova-cloud-controller:amqp' - - 'rabbitmq-server:amqp' - - - - 'nova-cloud-controller:cloud-compute' - - 'nova-compute:cloud-compute' - - - - 'nova-cloud-controller:image-service' - - 'glance:image-service' - - - - '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' - - - - 'keystone:shared-db' - - 'keystone-mysql-router:shared-db' - - - 'keystone-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - - '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' - - - - 'glance:ceph' - - 'ceph-mon:client' - - - - 'neutron-gateway:amqp' - - 'rabbitmq-server:amqp' - - - - 'nova-cloud-controller:quantum-network-service' - - 'neutron-gateway:quantum-network-service' - - - - 'neutron-api:shared-db' - - 'neutron-api-mysql-router:shared-db' - - - 'neutron-api-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - - 'neutron-api:amqp' - - 'rabbitmq-server:amqp' - - - - 'neutron-api:neutron-api' - - 'nova-cloud-controller:neutron-api' - - - - 'neutron-api:identity-service' - - 'keystone:identity-service' - - - - 'nova-compute:neutron-plugin' - - 'neutron-openvswitch:neutron-plugin' - - - - 'rabbitmq-server:amqp' - - 'neutron-openvswitch:amqp' - - - - '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' - - - - 'cinder:image-service' - - 'glance:image-service' - - - - 'cinder-ceph:storage-backend' - - 'cinder:storage-backend' - - - - 'nova-compute:ceph-access' - - 'cinder-ceph:ceph-access' - - - - 'ceph-mon:client' - - 'cinder-ceph:ceph' - - - - 'ceph-mon:osd' - - 'ceph-osd:mon' diff --git a/tests/bundles/impish-xena-ec.yaml b/tests/bundles/impish-xena-ec.yaml index 99b4359..1e95937 100644 --- a/tests/bundles/impish-xena-ec.yaml +++ b/tests/bundles/impish-xena-ec.yaml @@ -31,20 +31,26 @@ machines: applications: nova-cloud-controller-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 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 neutron-api-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 mysql-innodb-cluster: - charm: cs:~openstack-charmers-next/mysql-innodb-cluster + charm: ch:mysql-innodb-cluster num_units: 3 options: source: *openstack-origin @@ -52,9 +58,10 @@ applications: - '0' - '1' - '2' + channel: latest/edge ceph-osd: - charm: cs:~openstack-charmers-next/ceph-osd + charm: ch:ceph-osd num_units: 6 storage: osd-devices: '10G' @@ -68,9 +75,10 @@ applications: - '18' - '19' - '20' + channel: latest/edge ceph-mon: - charm: cs:~openstack-charmers-next/ceph-mon + charm: ch:ceph-mon num_units: 3 options: monitor-count: '3' @@ -79,15 +87,17 @@ applications: - '6' - '7' - '8' + channel: latest/edge rabbitmq-server: - charm: cs:~openstack-charmers-next/rabbitmq-server + charm: ch:rabbitmq-server num_units: 1 to: - '9' + 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 @@ -95,18 +105,20 @@ applications: debug: true to: - '10' + 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: - '11' + channel: latest/edge neutron-api: - charm: cs:~openstack-charmers-next/neutron-api + charm: ch:neutron-api num_units: 1 options: manage-neutron-plugin-legacy-mode: true @@ -116,37 +128,42 @@ applications: neutron-security-groups: true to: - '12' + channel: latest/edge keystone: - charm: cs:~openstack-charmers-next/keystone + charm: ch:keystone num_units: 1 options: openstack-origin: *openstack-origin to: - '13' + channel: latest/edge neutron-gateway: - charm: cs:~openstack-charmers-next/neutron-gateway + charm: ch:neutron-gateway num_units: 1 options: openstack-origin: *openstack-origin bridge-mappings: physnet1:br-ex to: - '14' + channel: latest/edge glance: - charm: cs:~openstack-charmers-next/glance + charm: ch:glance num_units: 1 options: openstack-origin: *openstack-origin to: - '15' + channel: latest/edge neutron-openvswitch: - charm: cs:~openstack-charmers-next/neutron-openvswitch + charm: ch:neutron-openvswitch + channel: latest/edge cinder: - charm: cs:~openstack-charmers-next/cinder + charm: ch:cinder num_units: 1 options: openstack-origin: *openstack-origin @@ -154,6 +171,7 @@ applications: glance-api-version: 2 to: - '16' + channel: latest/edge cinder-ceph: charm: ../../../cinder-ceph @@ -163,7 +181,7 @@ applications: ec-profile-m: 2 nova-compute: - charm: cs:~openstack-charmers-next/nova-compute + charm: ch:nova-compute num_units: 1 storage: ephemeral-device: '40G' @@ -175,6 +193,7 @@ applications: debug: true to: - '17' + channel: latest/edge relations: diff --git a/tests/bundles/impish-xena.yaml b/tests/bundles/impish-xena.yaml index 5635ab2..2461204 100644 --- a/tests/bundles/impish-xena.yaml +++ b/tests/bundles/impish-xena.yaml @@ -28,20 +28,26 @@ machines: applications: nova-cloud-controller-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 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 neutron-api-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 mysql-innodb-cluster: - charm: cs:~openstack-charmers-next/mysql-innodb-cluster + charm: ch:mysql-innodb-cluster num_units: 3 options: source: *openstack-origin @@ -49,9 +55,10 @@ applications: - '0' - '1' - '2' + channel: latest/edge ceph-osd: - charm: cs:~openstack-charmers-next/ceph-osd + charm: ch:ceph-osd num_units: 3 storage: osd-devices: '10G' @@ -62,9 +69,10 @@ applications: - '3' - '4' - '5' + channel: latest/edge ceph-mon: - charm: cs:~openstack-charmers-next/ceph-mon + charm: ch:ceph-mon num_units: 3 options: monitor-count: '3' @@ -73,15 +81,17 @@ applications: - '6' - '7' - '8' + channel: latest/edge rabbitmq-server: - charm: cs:~openstack-charmers-next/rabbitmq-server + charm: ch:rabbitmq-server num_units: 1 to: - '9' + 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 @@ -89,18 +99,20 @@ applications: debug: true to: - '10' + 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: - '11' + channel: latest/edge neutron-api: - charm: cs:~openstack-charmers-next/neutron-api + charm: ch:neutron-api num_units: 1 options: manage-neutron-plugin-legacy-mode: true @@ -110,37 +122,42 @@ applications: neutron-security-groups: true to: - '12' + channel: latest/edge keystone: - charm: cs:~openstack-charmers-next/keystone + charm: ch:keystone num_units: 1 options: openstack-origin: *openstack-origin to: - '13' + channel: latest/edge neutron-gateway: - charm: cs:~openstack-charmers-next/neutron-gateway + charm: ch:neutron-gateway num_units: 1 options: openstack-origin: *openstack-origin bridge-mappings: physnet1:br-ex to: - '14' + channel: latest/edge glance: - charm: cs:~openstack-charmers-next/glance + charm: ch:glance num_units: 1 options: openstack-origin: *openstack-origin to: - '15' + channel: latest/edge neutron-openvswitch: - charm: cs:~openstack-charmers-next/neutron-openvswitch + charm: ch:neutron-openvswitch + channel: latest/edge cinder: - charm: cs:~openstack-charmers-next/cinder + charm: ch:cinder num_units: 1 options: openstack-origin: *openstack-origin @@ -148,12 +165,13 @@ applications: glance-api-version: 2 to: - '16' + channel: latest/edge cinder-ceph: charm: ../../../cinder-ceph nova-compute: - charm: cs:~openstack-charmers-next/nova-compute + charm: ch:nova-compute num_units: 1 storage: ephemeral-device: '40G' @@ -165,6 +183,7 @@ applications: debug: true to: - '17' + channel: latest/edge relations: diff --git a/tests/bundles/jammy-yoga-ec.yaml b/tests/bundles/jammy-yoga-ec.yaml index ae1f3ca..6c45f8a 100644 --- a/tests/bundles/jammy-yoga-ec.yaml +++ b/tests/bundles/jammy-yoga-ec.yaml @@ -31,20 +31,26 @@ machines: applications: nova-cloud-controller-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 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 neutron-api-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 mysql-innodb-cluster: - charm: cs:~openstack-charmers-next/mysql-innodb-cluster + charm: ch:mysql-innodb-cluster num_units: 3 options: source: *openstack-origin @@ -52,9 +58,10 @@ applications: - '0' - '1' - '2' + channel: latest/edge ceph-osd: - charm: cs:~openstack-charmers-next/ceph-osd + charm: ch:ceph-osd num_units: 6 storage: osd-devices: '10G' @@ -68,9 +75,10 @@ applications: - '18' - '19' - '20' + channel: latest/edge ceph-mon: - charm: cs:~openstack-charmers-next/ceph-mon + charm: ch:ceph-mon num_units: 3 options: monitor-count: '3' @@ -79,15 +87,17 @@ applications: - '6' - '7' - '8' + channel: latest/edge rabbitmq-server: - charm: cs:~openstack-charmers-next/rabbitmq-server + charm: ch:rabbitmq-server num_units: 1 to: - '9' + 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 @@ -95,18 +105,20 @@ applications: debug: true to: - '10' + 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: - '11' + channel: latest/edge neutron-api: - charm: cs:~openstack-charmers-next/neutron-api + charm: ch:neutron-api num_units: 1 options: manage-neutron-plugin-legacy-mode: true @@ -116,37 +128,42 @@ applications: neutron-security-groups: true to: - '12' + channel: latest/edge keystone: - charm: cs:~openstack-charmers-next/keystone + charm: ch:keystone num_units: 1 options: openstack-origin: *openstack-origin to: - '13' + channel: latest/edge neutron-gateway: - charm: cs:~openstack-charmers-next/neutron-gateway + charm: ch:neutron-gateway num_units: 1 options: openstack-origin: *openstack-origin bridge-mappings: physnet1:br-ex to: - '14' + channel: latest/edge glance: - charm: cs:~openstack-charmers-next/glance + charm: ch:glance num_units: 1 options: openstack-origin: *openstack-origin to: - '15' + channel: latest/edge neutron-openvswitch: - charm: cs:~openstack-charmers-next/neutron-openvswitch + charm: ch:neutron-openvswitch + channel: latest/edge cinder: - charm: cs:~openstack-charmers-next/cinder + charm: ch:cinder num_units: 1 options: openstack-origin: *openstack-origin @@ -154,6 +171,7 @@ applications: glance-api-version: 2 to: - '16' + channel: latest/edge cinder-ceph: charm: ../../../cinder-ceph @@ -163,7 +181,7 @@ applications: ec-profile-m: 2 nova-compute: - charm: cs:~openstack-charmers-next/nova-compute + charm: ch:nova-compute num_units: 1 storage: ephemeral-device: '40G' @@ -175,6 +193,7 @@ applications: debug: true to: - '17' + channel: latest/edge relations: diff --git a/tests/bundles/jammy-yoga.yaml b/tests/bundles/jammy-yoga.yaml index 0daf522..6d665fa 100644 --- a/tests/bundles/jammy-yoga.yaml +++ b/tests/bundles/jammy-yoga.yaml @@ -28,20 +28,26 @@ machines: applications: nova-cloud-controller-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 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 neutron-api-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 mysql-innodb-cluster: - charm: cs:~openstack-charmers-next/mysql-innodb-cluster + charm: ch:mysql-innodb-cluster num_units: 3 options: source: *openstack-origin @@ -49,9 +55,10 @@ applications: - '0' - '1' - '2' + channel: latest/edge ceph-osd: - charm: cs:~openstack-charmers-next/ceph-osd + charm: ch:ceph-osd num_units: 3 storage: osd-devices: '10G' @@ -62,9 +69,10 @@ applications: - '3' - '4' - '5' + channel: latest/edge ceph-mon: - charm: cs:~openstack-charmers-next/ceph-mon + charm: ch:ceph-mon num_units: 3 options: monitor-count: '3' @@ -73,15 +81,17 @@ applications: - '6' - '7' - '8' + channel: latest/edge rabbitmq-server: - charm: cs:~openstack-charmers-next/rabbitmq-server + charm: ch:rabbitmq-server num_units: 1 to: - '9' + 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 @@ -89,18 +99,20 @@ applications: debug: true to: - '10' + 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: - '11' + channel: latest/edge neutron-api: - charm: cs:~openstack-charmers-next/neutron-api + charm: ch:neutron-api num_units: 1 options: manage-neutron-plugin-legacy-mode: true @@ -110,37 +122,42 @@ applications: neutron-security-groups: true to: - '12' + channel: latest/edge keystone: - charm: cs:~openstack-charmers-next/keystone + charm: ch:keystone num_units: 1 options: openstack-origin: *openstack-origin to: - '13' + channel: latest/edge neutron-gateway: - charm: cs:~openstack-charmers-next/neutron-gateway + charm: ch:neutron-gateway num_units: 1 options: openstack-origin: *openstack-origin bridge-mappings: physnet1:br-ex to: - '14' + channel: latest/edge glance: - charm: cs:~openstack-charmers-next/glance + charm: ch:glance num_units: 1 options: openstack-origin: *openstack-origin to: - '15' + channel: latest/edge neutron-openvswitch: - charm: cs:~openstack-charmers-next/neutron-openvswitch + charm: ch:neutron-openvswitch + channel: latest/edge cinder: - charm: cs:~openstack-charmers-next/cinder + charm: ch:cinder num_units: 1 options: openstack-origin: *openstack-origin @@ -148,12 +165,13 @@ applications: glance-api-version: 2 to: - '16' + channel: latest/edge cinder-ceph: charm: ../../../cinder-ceph nova-compute: - charm: cs:~openstack-charmers-next/nova-compute + charm: ch:nova-compute num_units: 1 storage: ephemeral-device: '40G' @@ -165,6 +183,7 @@ applications: debug: true to: - '17' + channel: latest/edge relations: diff --git a/tests/tests.yaml b/tests/tests.yaml index 9f87414..5180cf7 100644 --- a/tests/tests.yaml +++ b/tests/tests.yaml @@ -5,28 +5,15 @@ comment: | cinder and ceph-mon zaza charm tests. smoke_bundles: - - focal-ussuri + - focal-xena gate_bundles: - - bionic-queens - - bionic-stein - - bionic-ussuri - - focal-ussuri-ec - - focal-ussuri - - focal-victoria-ec - - focal-victoria - - focal-wallaby-ec - - focal-wallaby - focal-xena-ec - focal-xena - - hirsute-wallaby-ec - - hirsute-wallaby - impish-xena-ec - impish-xena dev_bundles: - - bionic-rocky - - bionic-train - focal-yoga-ec - focal-yoga - jammy-yoga-ec @@ -58,8 +45,6 @@ tests_options: policyd: service: cinder force_deploy: - - hirsute-wallaby - - hirsute-wallaby-ec - impish-xena - impish-xena-ec - jammy-yoga