From 71b6c122b97d9766b16ac53e0243655f28630f54 Mon Sep 17 00:00:00 2001 From: Alex Kavanagh Date: Thu, 27 Jan 2022 15:20:11 +0000 Subject: [PATCH] Migrate charm to charmhub latest/edge track Change-Id: I98db3dfc3d87d33787da90c55b17992dd0eaa300 --- charmcraft.yaml | 13 + metadata.yaml | 1 + osci.yaml | 9 +- src/metadata.yaml | 3 - src/tests/bundles/bionic-rocky.yaml | 198 ------------- src/tests/bundles/bionic-stein.yaml | 198 ------------- src/tests/bundles/bionic-train.yaml | 211 ------------- src/tests/bundles/bionic-ussuri.yaml | 220 -------------- src/tests/bundles/focal-ussuri.yaml | 390 ------------------------- src/tests/bundles/focal-victoria.yaml | 390 ------------------------- src/tests/bundles/focal-wallaby.yaml | 390 ------------------------- src/tests/bundles/focal-xena.yaml | 75 +++-- src/tests/bundles/focal-yoga.yaml | 75 +++-- src/tests/bundles/hirsute-wallaby.yaml | 390 ------------------------- src/tests/bundles/impish-xena.yaml | 75 +++-- src/tests/bundles/jammy-yoga.yaml | 75 +++-- src/tests/tests.yaml | 11 +- 17 files changed, 218 insertions(+), 2506 deletions(-) create mode 100644 charmcraft.yaml create mode 120000 metadata.yaml delete mode 100644 src/tests/bundles/bionic-rocky.yaml delete mode 100644 src/tests/bundles/bionic-stein.yaml delete mode 100644 src/tests/bundles/bionic-train.yaml delete mode 100644 src/tests/bundles/bionic-ussuri.yaml delete mode 100644 src/tests/bundles/focal-ussuri.yaml delete mode 100644 src/tests/bundles/focal-victoria.yaml delete mode 100644 src/tests/bundles/focal-wallaby.yaml delete mode 100644 src/tests/bundles/hirsute-wallaby.yaml diff --git a/charmcraft.yaml b/charmcraft.yaml new file mode 100644 index 0000000..a850351 --- /dev/null +++ b/charmcraft.yaml @@ -0,0 +1,13 @@ +type: charm + +parts: + charm: + source: src/ + plugin: reactive + build-snaps: [charm] + +bases: + - name: ubuntu + channel: "20.04" + architectures: + - amd64 diff --git a/metadata.yaml b/metadata.yaml new file mode 120000 index 0000000..0768683 --- /dev/null +++ b/metadata.yaml @@ -0,0 +1 @@ +src/metadata.yaml \ No newline at end of file diff --git a/osci.yaml b/osci.yaml index 0f3bb39..7c8351c 100644 --- a/osci.yaml +++ b/osci.yaml @@ -1,12 +1,9 @@ - project: templates: - - charm-yoga-unit-jobs - - charm-yoga-functional-jobs + - charm-unit-jobs-py38 + - charm-unit-jobs-py39 - charm-xena-functional-jobs - - charm-wallaby-functional-jobs - - charm-victoria-functional-jobs - - charm-ussuri-functional-jobs - - charm-stein-functional-jobs + - charm-yoga-functional-jobs vars: needs_charm_build: true charm_build_name: masakari-monitors diff --git a/src/metadata.yaml b/src/metadata.yaml index 4666a01..f0d9282 100644 --- a/src/metadata.yaml +++ b/src/metadata.yaml @@ -7,10 +7,7 @@ description: | tags: - openstack series: -- bionic - focal -- groovy -- hirsute - impish requires: identity-credentials: diff --git a/src/tests/bundles/bionic-rocky.yaml b/src/tests/bundles/bionic-rocky.yaml deleted file mode 100644 index e98ea54..0000000 --- a/src/tests/bundles/bionic-rocky.yaml +++ /dev/null @@ -1,198 +0,0 @@ -series: bionic -relations: -- - nova-compute:amqp - - rabbitmq-server:amqp -- - neutron-gateway:amqp - - rabbitmq-server:amqp -- - neutron-gateway:amqp-nova - - rabbitmq-server:amqp -- - keystone:shared-db - - mysql:shared-db -- - cinder:identity-service - - keystone:identity-service -- - nova-cloud-controller:identity-service - - keystone:identity-service -- - glance:identity-service - - keystone:identity-service -- - neutron-api:identity-service - - keystone:identity-service -- - neutron-openvswitch:neutron-plugin-api - - neutron-api:neutron-plugin-api -- - cinder:shared-db - - mysql:shared-db -- - neutron-api:shared-db - - mysql:shared-db -- - cinder:amqp - - rabbitmq-server:amqp -- - neutron-api:amqp - - rabbitmq-server:amqp -- - neutron-gateway:neutron-plugin-api - - neutron-api:neutron-plugin-api -- - glance:shared-db - - mysql:shared-db -- - glance:amqp - - rabbitmq-server:amqp -- - nova-cloud-controller:image-service - - glance:image-service -- - nova-compute:image-service - - glance:image-service -- - nova-cloud-controller:amqp - - rabbitmq-server:amqp -- - nova-cloud-controller:quantum-network-service - - neutron-gateway:quantum-network-service -- - nova-compute:neutron-plugin - - neutron-openvswitch:neutron-plugin -- - neutron-openvswitch:amqp - - rabbitmq-server:amqp -- - nova-cloud-controller:shared-db - - mysql:shared-db -- - nova-cloud-controller:neutron-api - - neutron-api:neutron-api -- - nova-cloud-controller:cloud-compute - - nova-compute:cloud-compute -- - masakari:shared-db - - mysql:shared-db -- - masakari:amqp - - rabbitmq-server:amqp -- - masakari:identity-service - - keystone:identity-service -- - glance:ceph - - ceph-mon:client -- - ceph-mon:osd - - ceph-osd:mon -- - cinder:storage-backend - - cinder-ceph:storage-backend -- - cinder-ceph:ceph - - ceph-mon:client -- - cinder-ceph:ceph-access - - nova-compute:ceph-access -- - nova-compute:juju-info - - masakari-monitors:container -- - masakari:ha - - hacluster:ha -- - keystone:identity-credentials - - masakari-monitors:identity-credentials -- - nova-compute:juju-info - - pacemaker-remote:juju-info -- - hacluster:pacemaker-remote - - pacemaker-remote:pacemaker-remote -- - vault:shared-db - - mysql:shared-db -- - vault:certificates - - keystone:certificates -- - vault:certificates - - neutron-api:certificates -- - vault:certificates - - cinder:certificates -- - vault:certificates - - glance:certificates -- - vault:certificates - - nova-cloud-controller:certificates -- - vault:certificates - - masakari:certificates -applications: - glance: - charm: cs:~openstack-charmers-next/glance - num_units: 1 - options: - openstack-origin: cloud:bionic-rocky - worker-multiplier: 0.25 - cinder: - charm: cs:~openstack-charmers-next/cinder - num_units: 1 - options: - block-device: "None" - glance-api-version: 2 - keystone: - charm: cs:~openstack-charmers-next/keystone - series: bionic - num_units: 1 - options: - admin-password: openstack - openstack-origin: cloud:bionic-rocky - worker-multiplier: 0.25 - mysql: - charm: cs:~openstack-charmers-next/percona-cluster - num_units: 1 - options: - innodb-buffer-pool-size: 256M - max-connections: 1000 - neutron-api: - charm: cs:~openstack-charmers-next/neutron-api - num_units: 1 - options: - flat-network-providers: physnet1 - neutron-security-groups: true - openstack-origin: cloud:bionic-rocky - worker-multiplier: 0.25 - neutron-gateway: - charm: cs:~openstack-charmers-next/neutron-gateway - num_units: 1 - options: - bridge-mappings: physnet1:br-ex - openstack-origin: cloud:bionic-rocky - worker-multiplier: 0.25 - neutron-openvswitch: - charm: cs:~openstack-charmers-next/neutron-openvswitch - num_units: 0 - nova-cloud-controller: - charm: cs:~openstack-charmers-next/nova-cloud-controller - num_units: 1 - options: - network-manager: Neutron - openstack-origin: cloud:bionic-rocky - worker-multiplier: 0.25 - debug: true - nova-compute: - charm: cs:~openstack-charmers-next/nova-compute - num_units: 3 - constraints: mem=4G - options: - config-flags: default_ephemeral_format=ext4 - enable-live-migration: true - enable-resize: true - migration-auth-type: ssh - openstack-origin: cloud:bionic-rocky - debug: true - cpu-model: kvm64 - cpu-mode: custom - # Allow for more retries when testing ontop of openstack - config-flags: block_device_allocate_retries=120 - rabbitmq-server: - charm: cs:~openstack-charmers-next/rabbitmq-server - num_units: 1 - masakari: - charm: cs:~openstack-charmers-next/masakari - series: bionic - num_units: 3 - options: - openstack-origin: cloud:bionic-rocky/proposed - ceph-mon: - charm: cs:~openstack-charmers-next/ceph-mon - num_units: 3 - options: - expected-osd-count: 3 - ceph-osd: - charm: cs:~openstack-charmers-next/ceph-osd - constraints: mem=1G - num_units: 3 - storage: - osd-devices: cinder,40G - cinder-ceph: - charm: cs:~openstack-charmers-next/cinder-ceph - masakari-monitors: - charm: ../../../masakari-monitors - series: bionic - hacluster: - charm: cs:~openstack-charmers-next/hacluster - options: - corosync_transport: unicast - cluster_count: 3 - pacemaker-remote: - charm: cs:~openstack-charmers-next/pacemaker-remote - options: - enable-stonith: False - enable-resources: False - vault: - num_units: 1 - charm: cs:~openstack-charmers-next/vault diff --git a/src/tests/bundles/bionic-stein.yaml b/src/tests/bundles/bionic-stein.yaml deleted file mode 100644 index f48c961..0000000 --- a/src/tests/bundles/bionic-stein.yaml +++ /dev/null @@ -1,198 +0,0 @@ -series: bionic -relations: -- - nova-compute:amqp - - rabbitmq-server:amqp -- - neutron-gateway:amqp - - rabbitmq-server:amqp -- - neutron-gateway:amqp-nova - - rabbitmq-server:amqp -- - keystone:shared-db - - mysql:shared-db -- - cinder:identity-service - - keystone:identity-service -- - nova-cloud-controller:identity-service - - keystone:identity-service -- - glance:identity-service - - keystone:identity-service -- - neutron-api:identity-service - - keystone:identity-service -- - neutron-openvswitch:neutron-plugin-api - - neutron-api:neutron-plugin-api -- - cinder:shared-db - - mysql:shared-db -- - neutron-api:shared-db - - mysql:shared-db -- - cinder:amqp - - rabbitmq-server:amqp -- - neutron-api:amqp - - rabbitmq-server:amqp -- - neutron-gateway:neutron-plugin-api - - neutron-api:neutron-plugin-api -- - glance:shared-db - - mysql:shared-db -- - glance:amqp - - rabbitmq-server:amqp -- - nova-cloud-controller:image-service - - glance:image-service -- - nova-compute:image-service - - glance:image-service -- - nova-cloud-controller:amqp - - rabbitmq-server:amqp -- - nova-cloud-controller:quantum-network-service - - neutron-gateway:quantum-network-service -- - nova-compute:neutron-plugin - - neutron-openvswitch:neutron-plugin -- - neutron-openvswitch:amqp - - rabbitmq-server:amqp -- - nova-cloud-controller:shared-db - - mysql:shared-db -- - nova-cloud-controller:neutron-api - - neutron-api:neutron-api -- - nova-cloud-controller:cloud-compute - - nova-compute:cloud-compute -- - masakari:shared-db - - mysql:shared-db -- - masakari:amqp - - rabbitmq-server:amqp -- - masakari:identity-service - - keystone:identity-service -- - glance:ceph - - ceph-mon:client -- - ceph-mon:osd - - ceph-osd:mon -- - cinder:storage-backend - - cinder-ceph:storage-backend -- - cinder-ceph:ceph - - ceph-mon:client -- - cinder-ceph:ceph-access - - nova-compute:ceph-access -- - nova-compute:juju-info - - masakari-monitors:container -- - masakari:ha - - hacluster:ha -- - keystone:identity-credentials - - masakari-monitors:identity-credentials -- - nova-compute:juju-info - - pacemaker-remote:juju-info -- - hacluster:pacemaker-remote - - pacemaker-remote:pacemaker-remote -- - vault:shared-db - - mysql:shared-db -- - vault:certificates - - keystone:certificates -- - vault:certificates - - neutron-api:certificates -- - vault:certificates - - cinder:certificates -- - vault:certificates - - glance:certificates -- - vault:certificates - - nova-cloud-controller:certificates -- - vault:certificates - - masakari:certificates -applications: - glance: - charm: cs:~openstack-charmers-next/glance - num_units: 1 - options: - openstack-origin: cloud:bionic-stein - worker-multiplier: 0.25 - cinder: - charm: cs:~openstack-charmers-next/cinder - num_units: 1 - options: - block-device: "None" - glance-api-version: 2 - keystone: - charm: cs:~openstack-charmers-next/keystone - series: bionic - num_units: 1 - options: - admin-password: openstack - openstack-origin: cloud:bionic-stein - worker-multiplier: 0.25 - mysql: - charm: cs:~openstack-charmers-next/percona-cluster - num_units: 1 - options: - innodb-buffer-pool-size: 256M - max-connections: 1000 - neutron-api: - charm: cs:~openstack-charmers-next/neutron-api - num_units: 1 - options: - flat-network-providers: physnet1 - neutron-security-groups: true - openstack-origin: cloud:bionic-stein - worker-multiplier: 0.25 - neutron-gateway: - charm: cs:~openstack-charmers-next/neutron-gateway - num_units: 1 - options: - bridge-mappings: physnet1:br-ex - openstack-origin: cloud:bionic-stein - worker-multiplier: 0.25 - neutron-openvswitch: - charm: cs:~openstack-charmers-next/neutron-openvswitch - num_units: 0 - nova-cloud-controller: - charm: cs:~openstack-charmers-next/nova-cloud-controller - num_units: 1 - options: - network-manager: Neutron - openstack-origin: cloud:bionic-stein - worker-multiplier: 0.25 - debug: true - nova-compute: - charm: cs:~openstack-charmers-next/nova-compute - num_units: 3 - constraints: mem=4G - options: - config-flags: default_ephemeral_format=ext4 - enable-live-migration: true - enable-resize: true - migration-auth-type: ssh - openstack-origin: cloud:bionic-stein - debug: true - cpu-model: kvm64 - cpu-mode: custom - # Allow for more retries when testing ontop of openstack - config-flags: block_device_allocate_retries=120 - rabbitmq-server: - charm: cs:~openstack-charmers-next/rabbitmq-server - num_units: 1 - masakari: - charm: cs:~openstack-charmers-next/masakari - series: bionic - num_units: 3 - options: - openstack-origin: cloud:bionic-stein - ceph-mon: - charm: cs:~openstack-charmers-next/ceph-mon - num_units: 3 - options: - expected-osd-count: 3 - ceph-osd: - charm: cs:~openstack-charmers-next/ceph-osd - constraints: mem=1G - num_units: 3 - storage: - osd-devices: cinder,40G - cinder-ceph: - charm: cs:~openstack-charmers-next/cinder-ceph - masakari-monitors: - charm: ../../../masakari-monitors - series: bionic - hacluster: - charm: cs:~openstack-charmers-next/hacluster - options: - corosync_transport: unicast - cluster_count: 3 - pacemaker-remote: - charm: cs:~openstack-charmers-next/pacemaker-remote - options: - enable-stonith: False - enable-resources: False - vault: - num_units: 1 - charm: cs:~openstack-charmers-next/vault diff --git a/src/tests/bundles/bionic-train.yaml b/src/tests/bundles/bionic-train.yaml deleted file mode 100644 index ec5846c..0000000 --- a/src/tests/bundles/bionic-train.yaml +++ /dev/null @@ -1,211 +0,0 @@ -series: bionic -relations: -- - nova-compute:amqp - - rabbitmq-server:amqp -- - neutron-gateway:amqp - - rabbitmq-server:amqp -- - neutron-gateway:amqp-nova - - rabbitmq-server:amqp -- - keystone:shared-db - - mysql:shared-db -- - cinder:identity-service - - keystone:identity-service -- - nova-cloud-controller:identity-service - - keystone:identity-service -- - glance:identity-service - - keystone:identity-service -- - neutron-api:identity-service - - keystone:identity-service -- - neutron-openvswitch:neutron-plugin-api - - neutron-api:neutron-plugin-api -- - cinder:shared-db - - mysql:shared-db -- - neutron-api:shared-db - - mysql:shared-db -- - cinder:amqp - - rabbitmq-server:amqp -- - neutron-api:amqp - - rabbitmq-server:amqp -- - neutron-gateway:neutron-plugin-api - - neutron-api:neutron-plugin-api -- - glance:shared-db - - mysql:shared-db -- - glance:amqp - - rabbitmq-server:amqp -- - nova-cloud-controller:image-service - - glance:image-service -- - nova-compute:image-service - - glance:image-service -- - nova-cloud-controller:amqp - - rabbitmq-server:amqp -- - nova-cloud-controller:quantum-network-service - - neutron-gateway:quantum-network-service -- - nova-compute:neutron-plugin - - neutron-openvswitch:neutron-plugin -- - neutron-openvswitch:amqp - - rabbitmq-server:amqp -- - nova-cloud-controller:shared-db - - mysql:shared-db -- - nova-cloud-controller:neutron-api - - neutron-api:neutron-api -- - nova-cloud-controller:cloud-compute - - nova-compute:cloud-compute -- - masakari:shared-db - - mysql:shared-db -- - masakari:amqp - - rabbitmq-server:amqp -- - masakari:identity-service - - keystone:identity-service -- - glance:ceph - - ceph-mon:client -- - ceph-mon:osd - - ceph-osd:mon -- - cinder:storage-backend - - cinder-ceph:storage-backend -- - cinder-ceph:ceph - - ceph-mon:client -- - cinder-ceph:ceph-access - - nova-compute:ceph-access -- - nova-compute:juju-info - - masakari-monitors:container -- - masakari:ha - - hacluster:ha -- - keystone:identity-credentials - - masakari-monitors:identity-credentials -- - nova-compute:juju-info - - pacemaker-remote:juju-info -- - hacluster:pacemaker-remote - - pacemaker-remote:pacemaker-remote -- - vault:shared-db - - mysql:shared-db -- - vault:certificates - - keystone:certificates -- - vault:certificates - - neutron-api:certificates -- - vault:certificates - - cinder:certificates -- - vault:certificates - - glance:certificates -- - vault:certificates - - nova-cloud-controller:certificates -- - vault:certificates - - masakari:certificates -- - placement:shared-db - - mysql:shared-db -- - placement:identity-service - - keystone:identity-service -- - placement:placement - - nova-cloud-controller:placement -- - vault:certificates - - placement:certificates -applications: - glance: - charm: cs:~openstack-charmers-next/glance - num_units: 1 - options: - openstack-origin: cloud:bionic-train - worker-multiplier: 0.25 - cinder: - charm: cs:~openstack-charmers-next/cinder - num_units: 1 - options: - block-device: "None" - glance-api-version: 2 - keystone: - charm: cs:~openstack-charmers-next/keystone - series: bionic - num_units: 1 - options: - admin-password: openstack - openstack-origin: cloud:bionic-train - worker-multiplier: 0.25 - mysql: - charm: cs:~openstack-charmers-next/percona-cluster - num_units: 1 - options: - innodb-buffer-pool-size: 256M - max-connections: 1000 - neutron-api: - charm: cs:~openstack-charmers-next/neutron-api - num_units: 1 - options: - flat-network-providers: physnet1 - neutron-security-groups: true - openstack-origin: cloud:bionic-train - worker-multiplier: 0.25 - neutron-gateway: - charm: cs:~openstack-charmers-next/neutron-gateway - num_units: 1 - options: - bridge-mappings: physnet1:br-ex - openstack-origin: cloud:bionic-train - worker-multiplier: 0.25 - neutron-openvswitch: - charm: cs:~openstack-charmers-next/neutron-openvswitch - num_units: 0 - nova-cloud-controller: - charm: cs:~openstack-charmers-next/nova-cloud-controller - num_units: 1 - options: - network-manager: Neutron - openstack-origin: cloud:bionic-train - worker-multiplier: 0.25 - debug: true - nova-compute: - charm: cs:~openstack-charmers-next/nova-compute - num_units: 3 - constraints: mem=4G - options: - config-flags: default_ephemeral_format=ext4 - enable-live-migration: true - enable-resize: true - migration-auth-type: ssh - openstack-origin: cloud:bionic-train - debug: true - cpu-model: kvm64 - cpu-mode: custom - # Allow for more retries when testing ontop of openstack - config-flags: block_device_allocate_retries=120 - rabbitmq-server: - charm: cs:~openstack-charmers-next/rabbitmq-server - num_units: 1 - masakari: - charm: cs:~openstack-charmers-next/masakari - series: bionic - num_units: 3 - options: - openstack-origin: cloud:bionic-train - ceph-mon: - charm: cs:~openstack-charmers-next/ceph-mon - num_units: 3 - options: - expected-osd-count: 3 - ceph-osd: - charm: cs:~openstack-charmers-next/ceph-osd - constraints: mem=1G - num_units: 3 - storage: - osd-devices: cinder,40G - cinder-ceph: - charm: cs:~openstack-charmers-next/cinder-ceph - masakari-monitors: - charm: ../../../masakari-monitors - series: bionic - hacluster: - charm: cs:~openstack-charmers-next/hacluster - options: - corosync_transport: unicast - cluster_count: 3 - pacemaker-remote: - charm: cs:~openstack-charmers-next/pacemaker-remote - options: - enable-stonith: False - enable-resources: False - vault: - num_units: 1 - charm: cs:~openstack-charmers-next/vault - placement: - charm: cs:~openstack-charmers-next/placement - num_units: 1 - options: - openstack-origin: cloud:bionic-train diff --git a/src/tests/bundles/bionic-ussuri.yaml b/src/tests/bundles/bionic-ussuri.yaml deleted file mode 100644 index 1265fd8..0000000 --- a/src/tests/bundles/bionic-ussuri.yaml +++ /dev/null @@ -1,220 +0,0 @@ -series: bionic -relations: -- - nova-compute:amqp - - rabbitmq-server:amqp -- - neutron-gateway:amqp - - rabbitmq-server:amqp -- - neutron-gateway:amqp-nova - - rabbitmq-server:amqp -- - keystone:shared-db - - mysql:shared-db -- - cinder:identity-service - - keystone:identity-service -- - nova-cloud-controller:identity-service - - keystone:identity-service -- - glance:identity-service - - keystone:identity-service -- - neutron-api:identity-service - - keystone:identity-service -- - neutron-openvswitch:neutron-plugin-api - - neutron-api:neutron-plugin-api -- - cinder:shared-db - - mysql:shared-db -- - neutron-api:shared-db - - mysql:shared-db -- - cinder:amqp - - rabbitmq-server:amqp -- - neutron-api:amqp - - rabbitmq-server:amqp -- - neutron-gateway:neutron-plugin-api - - neutron-api:neutron-plugin-api -- - glance:shared-db - - mysql:shared-db -- - glance:amqp - - rabbitmq-server:amqp -- - nova-cloud-controller:image-service - - glance:image-service -- - nova-compute:image-service - - glance:image-service -- - nova-cloud-controller:amqp - - rabbitmq-server:amqp -- - nova-cloud-controller:quantum-network-service - - neutron-gateway:quantum-network-service -- - nova-compute:neutron-plugin - - neutron-openvswitch:neutron-plugin -- - neutron-openvswitch:amqp - - rabbitmq-server:amqp -- - nova-cloud-controller:shared-db - - mysql:shared-db -- - nova-cloud-controller:neutron-api - - neutron-api:neutron-api -- - nova-cloud-controller:cloud-compute - - nova-compute:cloud-compute -- - masakari:shared-db - - mysql:shared-db -- - masakari:amqp - - rabbitmq-server:amqp -- - masakari:identity-service - - keystone:identity-service -- - glance:ceph - - ceph-mon:client -- - ceph-mon:osd - - ceph-osd:mon -- - cinder:storage-backend - - cinder-ceph:storage-backend -- - cinder-ceph:ceph - - ceph-mon:client -- - cinder-ceph:ceph-access - - nova-compute:ceph-access -- - nova-compute:juju-info - - masakari-monitors:container -- - masakari:ha - - hacluster:ha -- - keystone:identity-credentials - - masakari-monitors:identity-credentials -- - nova-compute:juju-info - - pacemaker-remote:juju-info -- - hacluster:pacemaker-remote - - pacemaker-remote:pacemaker-remote -- - vault:shared-db - - mysql:shared-db -- - vault:certificates - - keystone:certificates -- - vault:certificates - - neutron-api:certificates -- - vault:certificates - - cinder:certificates -- - vault:certificates - - glance:certificates -- - vault:certificates - - nova-cloud-controller:certificates -- - vault:certificates - - masakari:certificates -- - placement:shared-db - - mysql:shared-db -- - placement:identity-service - - keystone:identity-service -- - placement:placement - - nova-cloud-controller:placement -- - vault:certificates - - placement:certificates -applications: - glance: - charm: cs:~openstack-charmers-next/glance - num_units: 1 - options: - openstack-origin: cloud:bionic-ussuri - worker-multiplier: 0.25 - cinder: - charm: cs:~openstack-charmers-next/cinder - num_units: 1 - options: - openstack-origin: cloud:bionic-ussuri - block-device: "None" - glance-api-version: 2 - keystone: - charm: cs:~openstack-charmers-next/keystone - series: bionic - num_units: 1 - options: - admin-password: openstack - openstack-origin: cloud:bionic-ussuri - worker-multiplier: 0.25 - mysql: - charm: cs:~openstack-charmers-next/percona-cluster - num_units: 1 - options: - source: cloud:bionic-ussuri - innodb-buffer-pool-size: 256M - max-connections: 1000 - neutron-api: - charm: cs:~openstack-charmers-next/neutron-api - num_units: 1 - options: - manage-neutron-plugin-legacy-mode: true - neutron-plugin: ovs - flat-network-providers: physnet1 - neutron-security-groups: true - openstack-origin: cloud:bionic-ussuri - worker-multiplier: 0.25 - neutron-gateway: - charm: cs:~openstack-charmers-next/neutron-gateway - num_units: 1 - options: - bridge-mappings: physnet1:br-ex - openstack-origin: cloud:bionic-ussuri - worker-multiplier: 0.25 - neutron-openvswitch: - charm: cs:~openstack-charmers-next/neutron-openvswitch - num_units: 0 - nova-cloud-controller: - charm: cs:~openstack-charmers-next/nova-cloud-controller - num_units: 1 - options: - network-manager: Neutron - openstack-origin: cloud:bionic-ussuri - worker-multiplier: 0.25 - debug: true - nova-compute: - charm: cs:~openstack-charmers-next/nova-compute - num_units: 3 - constraints: mem=4G - options: - config-flags: default_ephemeral_format=ext4 - enable-live-migration: true - enable-resize: true - migration-auth-type: ssh - openstack-origin: cloud:bionic-ussuri - debug: true - cpu-model: kvm64 - cpu-mode: custom - # Allow for more retries when testing ontop of openstack - config-flags: block_device_allocate_retries=120 - rabbitmq-server: - charm: cs:~openstack-charmers-next/rabbitmq-server - num_units: 1 - options: - source: cloud:bionic-ussuri - masakari: - charm: cs:~openstack-charmers-next/masakari - series: bionic - num_units: 3 - options: - openstack-origin: cloud:bionic-ussuri - ceph-mon: - charm: cs:~openstack-charmers-next/ceph-mon - num_units: 3 - options: - source: cloud:bionic-ussuri - expected-osd-count: 3 - ceph-osd: - charm: cs:~openstack-charmers-next/ceph-osd - constraints: mem=1G - num_units: 3 - options: - source: cloud:bionic-ussuri - storage: - osd-devices: cinder,40G - cinder-ceph: - charm: cs:~openstack-charmers-next/cinder-ceph - masakari-monitors: - charm: ../../../masakari-monitors - series: bionic - hacluster: - charm: cs:~openstack-charmers-next/hacluster - options: - corosync_transport: unicast - cluster_count: 3 - pacemaker-remote: - charm: cs:~openstack-charmers-next/pacemaker-remote - options: - enable-stonith: False - enable-resources: False - vault: - num_units: 1 - charm: cs:~openstack-charmers-next/vault - placement: - charm: cs:~openstack-charmers-next/placement - num_units: 1 - options: - openstack-origin: cloud:bionic-ussuri diff --git a/src/tests/bundles/focal-ussuri.yaml b/src/tests/bundles/focal-ussuri.yaml deleted file mode 100644 index eedcfda..0000000 --- a/src/tests/bundles/focal-ussuri.yaml +++ /dev/null @@ -1,390 +0,0 @@ -variables: - openstack-origin: &openstack-origin distro - -series: focal - -comment: -- 'machines section to decide order of deployment. database sooner = faster' -machines: - '0': - constraints: mem=3072M - '1': - constraints: mem=3072M - '2': - constraints: mem=3072M - '3': - '4': - '5': - '6': - '7': - '8': - constraints: mem=4096M - '9': - constraints: mem=4096M - '10': - constraints: mem=4096M - '11': - '12': - '13': - '14': - '15': - '16': - '17': - '18': - '19': - '20': - '21': - '22': - '23': - -applications: - - keystone-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router - cinder-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router - neutron-api-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router - glance-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router - nova-cloud-controller-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router - masakari-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router - vault-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router - placement-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router - - mysql-innodb-cluster: - charm: cs:~openstack-charmers-next/mysql-innodb-cluster - num_units: 3 - options: - source: *openstack-origin - to: - - '0' - - '1' - - '2' - - glance: - charm: cs:~openstack-charmers-next/glance - num_units: 1 - options: - openstack-origin: *openstack-origin - worker-multiplier: 0.25 - to: - - '3' - - cinder: - charm: cs:~openstack-charmers-next/cinder - num_units: 1 - options: - openstack-origin: *openstack-origin - block-device: "None" - glance-api-version: 2 - to: - - '4' - - keystone: - charm: cs:~openstack-charmers-next/keystone - num_units: 1 - options: - admin-password: openstack - openstack-origin: *openstack-origin - worker-multiplier: 0.25 - to: - - '5' - - neutron-api: - charm: cs:~openstack-charmers-next/neutron-api - num_units: 1 - options: - manage-neutron-plugin-legacy-mode: true - flat-network-providers: physnet1 - neutron-security-groups: true - openstack-origin: *openstack-origin - worker-multiplier: 0.25 - to: - - '6' - - neutron-gateway: - charm: cs:~openstack-charmers-next/neutron-gateway - num_units: 1 - options: - bridge-mappings: physnet1:br-ex - openstack-origin: *openstack-origin - worker-multiplier: 0.25 - to: - - '7' - - neutron-openvswitch: - charm: cs:~openstack-charmers-next/neutron-openvswitch - num_units: 0 - - nova-cloud-controller: - charm: cs:~openstack-charmers-next/nova-cloud-controller - num_units: 1 - options: - network-manager: Neutron - openstack-origin: *openstack-origin - worker-multiplier: 0.25 - debug: true - to: - - '23' - - nova-compute: - charm: cs:~openstack-charmers-next/nova-compute - num_units: 3 - constraints: mem=4G - options: - config-flags: default_ephemeral_format=ext4 - enable-live-migration: true - enable-resize: true - migration-auth-type: ssh - openstack-origin: *openstack-origin - debug: true - cpu-model: kvm64 - cpu-mode: custom - # Allow for more retries when testing ontop of openstack - config-flags: block_device_allocate_retries=120 - to: - - '8' - - '9' - - '10' - - rabbitmq-server: - charm: cs:~openstack-charmers-next/rabbitmq-server - num_units: 1 - to: - - '11' - - masakari: - charm: cs:~openstack-charmers-next/masakari - num_units: 3 - options: - openstack-origin: *openstack-origin - to: - - '12' - - '13' - - '14' - - ceph-mon: - charm: cs:~openstack-charmers-next/ceph-mon - num_units: 3 - options: - source: *openstack-origin - expected-osd-count: 3 - to: - - '15' - - '16' - - '17' - - ceph-osd: - charm: cs:~openstack-charmers-next/ceph-osd - constraints: mem=1G - num_units: 3 - options: - source: *openstack-origin - storage: - osd-devices: cinder,40G - to: - - '18' - - '19' - - '20' - - cinder-ceph: - charm: cs:~openstack-charmers-next/cinder-ceph - - masakari-monitors: - charm: ../../masakari-monitors - - hacluster: - charm: cs:~openstack-charmers-next/hacluster - options: - corosync_transport: unicast - cluster_count: 3 - - pacemaker-remote: - charm: cs:~openstack-charmers-next/pacemaker-remote - options: - enable-stonith: False - enable-resources: False - - vault: - num_units: 1 - charm: cs:~openstack-charmers-next/vault - to: - - '21' - - placement: - charm: cs:~openstack-charmers-next/placement - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '22' - -relations: - - - - 'nova-compute:amqp' - - 'rabbitmq-server:amqp' - - - - 'neutron-gateway:amqp' - - 'rabbitmq-server:amqp' - - - - 'neutron-gateway:amqp-nova' - - 'rabbitmq-server:amqp' - - - - 'keystone:shared-db' - - 'keystone-mysql-router:shared-db' - - - 'keystone-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - - 'cinder:identity-service' - - 'keystone:identity-service' - - - - 'nova-cloud-controller:identity-service' - - 'keystone:identity-service' - - - - 'glance:identity-service' - - 'keystone:identity-service' - - - - 'neutron-api:identity-service' - - 'keystone:identity-service' - - - - 'neutron-openvswitch:neutron-plugin-api' - - 'neutron-api:neutron-plugin-api' - - - - 'cinder:shared-db' - - 'cinder-mysql-router:shared-db' - - - 'cinder-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - - 'neutron-api:shared-db' - - 'neutron-api-mysql-router:shared-db' - - - 'neutron-api-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - - 'cinder:amqp' - - 'rabbitmq-server:amqp' - - - - 'neutron-api:amqp' - - 'rabbitmq-server:amqp' - - - - 'neutron-gateway:neutron-plugin-api' - - 'neutron-api:neutron-plugin-api' - - - - 'glance:shared-db' - - 'glance-mysql-router:shared-db' - - - 'glance-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - - 'glance:amqp' - - 'rabbitmq-server:amqp' - - - - 'nova-cloud-controller:image-service' - - 'glance:image-service' - - - - 'nova-compute:image-service' - - 'glance:image-service' - - - - 'nova-cloud-controller:amqp' - - 'rabbitmq-server:amqp' - - - - 'nova-cloud-controller:quantum-network-service' - - 'neutron-gateway:quantum-network-service' - - - - 'nova-compute:neutron-plugin' - - 'neutron-openvswitch:neutron-plugin' - - - - 'neutron-openvswitch: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:neutron-api' - - 'neutron-api:neutron-api' - - - - 'nova-cloud-controller:cloud-compute' - - 'nova-compute:cloud-compute' - - - - 'masakari:shared-db' - - 'masakari-mysql-router:shared-db' - - - 'masakari-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - - 'masakari:amqp' - - 'rabbitmq-server:amqp' - - - - 'masakari:identity-service' - - 'keystone:identity-service' - - - - 'glance:ceph' - - 'ceph-mon:client' - - - - 'ceph-mon:osd' - - 'ceph-osd:mon' - - - - 'cinder:storage-backend' - - 'cinder-ceph:storage-backend' - - - - 'cinder-ceph:ceph' - - 'ceph-mon:client' - - - - 'cinder-ceph:ceph-access' - - 'nova-compute:ceph-access' - - - - 'nova-compute:juju-info' - - 'masakari-monitors:container' - - - - 'masakari:ha' - - 'hacluster:ha' - - - - 'keystone:identity-credentials' - - 'masakari-monitors:identity-credentials' - - - - 'nova-compute:juju-info' - - 'pacemaker-remote:juju-info' - - - - 'hacluster:pacemaker-remote' - - 'pacemaker-remote:pacemaker-remote' - - - - 'vault:shared-db' - - 'vault-mysql-router:shared-db' - - - 'vault-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - - 'vault:certificates' - - 'keystone:certificates' - - - - 'vault:certificates' - - 'neutron-api:certificates' - - - - 'vault:certificates' - - 'cinder:certificates' - - - - 'vault:certificates' - - 'glance:certificates' - - - - 'vault:certificates' - - 'nova-cloud-controller:certificates' - - - - 'vault:certificates' - - 'masakari:certificates' - - - - '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' - - - - 'vault:certificates' - - 'placement:certificates' diff --git a/src/tests/bundles/focal-victoria.yaml b/src/tests/bundles/focal-victoria.yaml deleted file mode 100644 index 0a59879..0000000 --- a/src/tests/bundles/focal-victoria.yaml +++ /dev/null @@ -1,390 +0,0 @@ -variables: - openstack-origin: &openstack-origin cloud:focal-victoria - -series: focal - -comment: -- 'machines section to decide order of deployment. database sooner = faster' -machines: - '0': - constraints: mem=3072M - '1': - constraints: mem=3072M - '2': - constraints: mem=3072M - '3': - '4': - '5': - '6': - '7': - '8': - constraints: mem=4096M - '9': - constraints: mem=4096M - '10': - constraints: mem=4096M - '11': - '12': - '13': - '14': - '15': - '16': - '17': - '18': - '19': - '20': - '21': - '22': - '23': - -applications: - - keystone-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router - cinder-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router - neutron-api-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router - glance-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router - nova-cloud-controller-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router - masakari-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router - vault-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router - placement-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router - - mysql-innodb-cluster: - charm: cs:~openstack-charmers-next/mysql-innodb-cluster - num_units: 3 - options: - source: *openstack-origin - to: - - '0' - - '1' - - '2' - - glance: - charm: cs:~openstack-charmers-next/glance - num_units: 1 - options: - openstack-origin: *openstack-origin - worker-multiplier: 0.25 - to: - - '3' - - cinder: - charm: cs:~openstack-charmers-next/cinder - num_units: 1 - options: - openstack-origin: *openstack-origin - block-device: "None" - glance-api-version: 2 - to: - - '4' - - keystone: - charm: cs:~openstack-charmers-next/keystone - num_units: 1 - options: - admin-password: openstack - openstack-origin: *openstack-origin - worker-multiplier: 0.25 - to: - - '5' - - neutron-api: - charm: cs:~openstack-charmers-next/neutron-api - num_units: 1 - options: - manage-neutron-plugin-legacy-mode: true - flat-network-providers: physnet1 - neutron-security-groups: true - openstack-origin: *openstack-origin - worker-multiplier: 0.25 - to: - - '6' - - neutron-gateway: - charm: cs:~openstack-charmers-next/neutron-gateway - num_units: 1 - options: - bridge-mappings: physnet1:br-ex - openstack-origin: *openstack-origin - worker-multiplier: 0.25 - to: - - '7' - - neutron-openvswitch: - charm: cs:~openstack-charmers-next/neutron-openvswitch - num_units: 0 - - nova-cloud-controller: - charm: cs:~openstack-charmers-next/nova-cloud-controller - num_units: 1 - options: - network-manager: Neutron - openstack-origin: *openstack-origin - worker-multiplier: 0.25 - debug: true - to: - - '23' - - nova-compute: - charm: cs:~openstack-charmers-next/nova-compute - num_units: 3 - constraints: mem=4G - options: - config-flags: default_ephemeral_format=ext4 - enable-live-migration: true - enable-resize: true - migration-auth-type: ssh - openstack-origin: *openstack-origin - debug: true - cpu-model: kvm64 - cpu-mode: custom - # Allow for more retries when testing ontop of openstack - config-flags: block_device_allocate_retries=120 - to: - - '8' - - '9' - - '10' - - rabbitmq-server: - charm: cs:~openstack-charmers-next/rabbitmq-server - num_units: 1 - to: - - '11' - - masakari: - charm: cs:~openstack-charmers-next/masakari - num_units: 3 - options: - openstack-origin: *openstack-origin - to: - - '12' - - '13' - - '14' - - ceph-mon: - charm: cs:~openstack-charmers-next/ceph-mon - num_units: 3 - options: - source: *openstack-origin - expected-osd-count: 3 - to: - - '15' - - '16' - - '17' - - ceph-osd: - charm: cs:~openstack-charmers-next/ceph-osd - constraints: mem=1G - num_units: 3 - options: - source: *openstack-origin - storage: - osd-devices: cinder,40G - to: - - '18' - - '19' - - '20' - - cinder-ceph: - charm: cs:~openstack-charmers-next/cinder-ceph - - masakari-monitors: - charm: ../../masakari-monitors - - hacluster: - charm: cs:~openstack-charmers-next/hacluster - options: - corosync_transport: unicast - cluster_count: 3 - - pacemaker-remote: - charm: cs:~openstack-charmers-next/pacemaker-remote - options: - enable-stonith: False - enable-resources: False - - vault: - num_units: 1 - charm: cs:~openstack-charmers-next/vault - to: - - '21' - - placement: - charm: cs:~openstack-charmers-next/placement - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '22' - -relations: - - - - 'nova-compute:amqp' - - 'rabbitmq-server:amqp' - - - - 'neutron-gateway:amqp' - - 'rabbitmq-server:amqp' - - - - 'neutron-gateway:amqp-nova' - - 'rabbitmq-server:amqp' - - - - 'keystone:shared-db' - - 'keystone-mysql-router:shared-db' - - - 'keystone-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - - 'cinder:identity-service' - - 'keystone:identity-service' - - - - 'nova-cloud-controller:identity-service' - - 'keystone:identity-service' - - - - 'glance:identity-service' - - 'keystone:identity-service' - - - - 'neutron-api:identity-service' - - 'keystone:identity-service' - - - - 'neutron-openvswitch:neutron-plugin-api' - - 'neutron-api:neutron-plugin-api' - - - - 'cinder:shared-db' - - 'cinder-mysql-router:shared-db' - - - 'cinder-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - - 'neutron-api:shared-db' - - 'neutron-api-mysql-router:shared-db' - - - 'neutron-api-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - - 'cinder:amqp' - - 'rabbitmq-server:amqp' - - - - 'neutron-api:amqp' - - 'rabbitmq-server:amqp' - - - - 'neutron-gateway:neutron-plugin-api' - - 'neutron-api:neutron-plugin-api' - - - - 'glance:shared-db' - - 'glance-mysql-router:shared-db' - - - 'glance-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - - 'glance:amqp' - - 'rabbitmq-server:amqp' - - - - 'nova-cloud-controller:image-service' - - 'glance:image-service' - - - - 'nova-compute:image-service' - - 'glance:image-service' - - - - 'nova-cloud-controller:amqp' - - 'rabbitmq-server:amqp' - - - - 'nova-cloud-controller:quantum-network-service' - - 'neutron-gateway:quantum-network-service' - - - - 'nova-compute:neutron-plugin' - - 'neutron-openvswitch:neutron-plugin' - - - - 'neutron-openvswitch: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:neutron-api' - - 'neutron-api:neutron-api' - - - - 'nova-cloud-controller:cloud-compute' - - 'nova-compute:cloud-compute' - - - - 'masakari:shared-db' - - 'masakari-mysql-router:shared-db' - - - 'masakari-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - - 'masakari:amqp' - - 'rabbitmq-server:amqp' - - - - 'masakari:identity-service' - - 'keystone:identity-service' - - - - 'glance:ceph' - - 'ceph-mon:client' - - - - 'ceph-mon:osd' - - 'ceph-osd:mon' - - - - 'cinder:storage-backend' - - 'cinder-ceph:storage-backend' - - - - 'cinder-ceph:ceph' - - 'ceph-mon:client' - - - - 'cinder-ceph:ceph-access' - - 'nova-compute:ceph-access' - - - - 'nova-compute:juju-info' - - 'masakari-monitors:container' - - - - 'masakari:ha' - - 'hacluster:ha' - - - - 'keystone:identity-credentials' - - 'masakari-monitors:identity-credentials' - - - - 'nova-compute:juju-info' - - 'pacemaker-remote:juju-info' - - - - 'hacluster:pacemaker-remote' - - 'pacemaker-remote:pacemaker-remote' - - - - 'vault:shared-db' - - 'vault-mysql-router:shared-db' - - - 'vault-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - - 'vault:certificates' - - 'keystone:certificates' - - - - 'vault:certificates' - - 'neutron-api:certificates' - - - - 'vault:certificates' - - 'cinder:certificates' - - - - 'vault:certificates' - - 'glance:certificates' - - - - 'vault:certificates' - - 'nova-cloud-controller:certificates' - - - - 'vault:certificates' - - 'masakari:certificates' - - - - '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' - - - - 'vault:certificates' - - 'placement:certificates' diff --git a/src/tests/bundles/focal-wallaby.yaml b/src/tests/bundles/focal-wallaby.yaml deleted file mode 100644 index a57b8b5..0000000 --- a/src/tests/bundles/focal-wallaby.yaml +++ /dev/null @@ -1,390 +0,0 @@ -variables: - openstack-origin: &openstack-origin cloud:focal-wallaby - -series: focal - -comment: -- 'machines section to decide order of deployment. database sooner = faster' -machines: - '0': - constraints: mem=3072M - '1': - constraints: mem=3072M - '2': - constraints: mem=3072M - '3': - '4': - '5': - '6': - '7': - '8': - constraints: mem=4096M - '9': - constraints: mem=4096M - '10': - constraints: mem=4096M - '11': - '12': - '13': - '14': - '15': - '16': - '17': - '18': - '19': - '20': - '21': - '22': - '23': - -applications: - - keystone-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router - cinder-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router - neutron-api-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router - glance-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router - nova-cloud-controller-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router - masakari-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router - vault-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router - placement-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router - - mysql-innodb-cluster: - charm: cs:~openstack-charmers-next/mysql-innodb-cluster - num_units: 3 - options: - source: *openstack-origin - to: - - '0' - - '1' - - '2' - - glance: - charm: cs:~openstack-charmers-next/glance - num_units: 1 - options: - openstack-origin: *openstack-origin - worker-multiplier: 0.25 - to: - - '3' - - cinder: - charm: cs:~openstack-charmers-next/cinder - num_units: 1 - options: - openstack-origin: *openstack-origin - block-device: "None" - glance-api-version: 2 - to: - - '4' - - keystone: - charm: cs:~openstack-charmers-next/keystone - num_units: 1 - options: - admin-password: openstack - openstack-origin: *openstack-origin - worker-multiplier: 0.25 - to: - - '5' - - neutron-api: - charm: cs:~openstack-charmers-next/neutron-api - num_units: 1 - options: - manage-neutron-plugin-legacy-mode: true - flat-network-providers: physnet1 - neutron-security-groups: true - openstack-origin: *openstack-origin - worker-multiplier: 0.25 - to: - - '6' - - neutron-gateway: - charm: cs:~openstack-charmers-next/neutron-gateway - num_units: 1 - options: - bridge-mappings: physnet1:br-ex - openstack-origin: *openstack-origin - worker-multiplier: 0.25 - to: - - '7' - - neutron-openvswitch: - charm: cs:~openstack-charmers-next/neutron-openvswitch - num_units: 0 - - nova-cloud-controller: - charm: cs:~openstack-charmers-next/nova-cloud-controller - num_units: 1 - options: - network-manager: Neutron - openstack-origin: *openstack-origin - worker-multiplier: 0.25 - debug: true - to: - - '23' - - nova-compute: - charm: cs:~openstack-charmers-next/nova-compute - num_units: 3 - constraints: mem=4G - options: - config-flags: default_ephemeral_format=ext4 - enable-live-migration: true - enable-resize: true - migration-auth-type: ssh - openstack-origin: *openstack-origin - debug: true - cpu-model: kvm64 - cpu-mode: custom - # Allow for more retries when testing ontop of openstack - config-flags: block_device_allocate_retries=120 - to: - - '8' - - '9' - - '10' - - rabbitmq-server: - charm: cs:~openstack-charmers-next/rabbitmq-server - num_units: 1 - to: - - '11' - - masakari: - charm: cs:~openstack-charmers-next/masakari - num_units: 3 - options: - openstack-origin: *openstack-origin - to: - - '12' - - '13' - - '14' - - ceph-mon: - charm: cs:~openstack-charmers-next/ceph-mon - num_units: 3 - options: - source: *openstack-origin - expected-osd-count: 3 - to: - - '15' - - '16' - - '17' - - ceph-osd: - charm: cs:~openstack-charmers-next/ceph-osd - constraints: mem=1G - num_units: 3 - options: - source: *openstack-origin - storage: - osd-devices: cinder,40G - to: - - '18' - - '19' - - '20' - - cinder-ceph: - charm: cs:~openstack-charmers-next/cinder-ceph - - masakari-monitors: - charm: ../../masakari-monitors - - hacluster: - charm: cs:~openstack-charmers-next/hacluster - options: - corosync_transport: unicast - cluster_count: 3 - - pacemaker-remote: - charm: cs:~openstack-charmers-next/pacemaker-remote - options: - enable-stonith: False - enable-resources: False - - vault: - num_units: 1 - charm: cs:~openstack-charmers-next/vault - to: - - '21' - - placement: - charm: cs:~openstack-charmers-next/placement - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '22' - -relations: - - - - 'nova-compute:amqp' - - 'rabbitmq-server:amqp' - - - - 'neutron-gateway:amqp' - - 'rabbitmq-server:amqp' - - - - 'neutron-gateway:amqp-nova' - - 'rabbitmq-server:amqp' - - - - 'keystone:shared-db' - - 'keystone-mysql-router:shared-db' - - - 'keystone-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - - 'cinder:identity-service' - - 'keystone:identity-service' - - - - 'nova-cloud-controller:identity-service' - - 'keystone:identity-service' - - - - 'glance:identity-service' - - 'keystone:identity-service' - - - - 'neutron-api:identity-service' - - 'keystone:identity-service' - - - - 'neutron-openvswitch:neutron-plugin-api' - - 'neutron-api:neutron-plugin-api' - - - - 'cinder:shared-db' - - 'cinder-mysql-router:shared-db' - - - 'cinder-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - - 'neutron-api:shared-db' - - 'neutron-api-mysql-router:shared-db' - - - 'neutron-api-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - - 'cinder:amqp' - - 'rabbitmq-server:amqp' - - - - 'neutron-api:amqp' - - 'rabbitmq-server:amqp' - - - - 'neutron-gateway:neutron-plugin-api' - - 'neutron-api:neutron-plugin-api' - - - - 'glance:shared-db' - - 'glance-mysql-router:shared-db' - - - 'glance-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - - 'glance:amqp' - - 'rabbitmq-server:amqp' - - - - 'nova-cloud-controller:image-service' - - 'glance:image-service' - - - - 'nova-compute:image-service' - - 'glance:image-service' - - - - 'nova-cloud-controller:amqp' - - 'rabbitmq-server:amqp' - - - - 'nova-cloud-controller:quantum-network-service' - - 'neutron-gateway:quantum-network-service' - - - - 'nova-compute:neutron-plugin' - - 'neutron-openvswitch:neutron-plugin' - - - - 'neutron-openvswitch: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:neutron-api' - - 'neutron-api:neutron-api' - - - - 'nova-cloud-controller:cloud-compute' - - 'nova-compute:cloud-compute' - - - - 'masakari:shared-db' - - 'masakari-mysql-router:shared-db' - - - 'masakari-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - - 'masakari:amqp' - - 'rabbitmq-server:amqp' - - - - 'masakari:identity-service' - - 'keystone:identity-service' - - - - 'glance:ceph' - - 'ceph-mon:client' - - - - 'ceph-mon:osd' - - 'ceph-osd:mon' - - - - 'cinder:storage-backend' - - 'cinder-ceph:storage-backend' - - - - 'cinder-ceph:ceph' - - 'ceph-mon:client' - - - - 'cinder-ceph:ceph-access' - - 'nova-compute:ceph-access' - - - - 'nova-compute:juju-info' - - 'masakari-monitors:container' - - - - 'masakari:ha' - - 'hacluster:ha' - - - - 'keystone:identity-credentials' - - 'masakari-monitors:identity-credentials' - - - - 'nova-compute:juju-info' - - 'pacemaker-remote:juju-info' - - - - 'hacluster:pacemaker-remote' - - 'pacemaker-remote:pacemaker-remote' - - - - 'vault:shared-db' - - 'vault-mysql-router:shared-db' - - - 'vault-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - - 'vault:certificates' - - 'keystone:certificates' - - - - 'vault:certificates' - - 'neutron-api:certificates' - - - - 'vault:certificates' - - 'cinder:certificates' - - - - 'vault:certificates' - - 'glance:certificates' - - - - 'vault:certificates' - - 'nova-cloud-controller:certificates' - - - - 'vault:certificates' - - 'masakari:certificates' - - - - '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' - - - - 'vault:certificates' - - 'placement:certificates' diff --git a/src/tests/bundles/focal-xena.yaml b/src/tests/bundles/focal-xena.yaml index 2331cf9..8b25ae0 100644 --- a/src/tests/bundles/focal-xena.yaml +++ b/src/tests/bundles/focal-xena.yaml @@ -40,24 +40,32 @@ machines: applications: keystone-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: ch:mysql-router + channel: latest/edge cinder-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: ch:mysql-router + channel: latest/edge neutron-api-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: ch:mysql-router + channel: latest/edge glance-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: ch:mysql-router + channel: latest/edge nova-cloud-controller-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: ch:mysql-router + channel: latest/edge masakari-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: ch:mysql-router + channel: latest/edge vault-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: ch:mysql-router + channel: latest/edge placement-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: ch:mysql-router + channel: latest/edge mysql-innodb-cluster: - charm: cs:~openstack-charmers-next/mysql-innodb-cluster + charm: ch:mysql-innodb-cluster num_units: 3 options: source: *openstack-origin @@ -65,18 +73,20 @@ applications: - '0' - '1' - '2' + channel: latest/edge glance: - charm: cs:~openstack-charmers-next/glance + charm: ch:glance num_units: 1 options: openstack-origin: *openstack-origin worker-multiplier: 0.25 to: - '3' + channel: latest/edge cinder: - charm: cs:~openstack-charmers-next/cinder + charm: ch:cinder num_units: 1 options: openstack-origin: *openstack-origin @@ -84,9 +94,10 @@ applications: glance-api-version: 2 to: - '4' + channel: latest/edge keystone: - charm: cs:~openstack-charmers-next/keystone + charm: ch:keystone num_units: 1 options: admin-password: openstack @@ -94,9 +105,10 @@ applications: worker-multiplier: 0.25 to: - '5' + 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 @@ -106,9 +118,10 @@ applications: worker-multiplier: 0.25 to: - '6' + channel: latest/edge neutron-gateway: - charm: cs:~openstack-charmers-next/neutron-gateway + charm: ch:neutron-gateway num_units: 1 options: bridge-mappings: physnet1:br-ex @@ -116,13 +129,15 @@ applications: worker-multiplier: 0.25 to: - '7' + channel: latest/edge neutron-openvswitch: - charm: cs:~openstack-charmers-next/neutron-openvswitch + charm: ch:neutron-openvswitch num_units: 0 + channel: latest/edge nova-cloud-controller: - charm: cs:~openstack-charmers-next/nova-cloud-controller + charm: ch:nova-cloud-controller num_units: 1 options: network-manager: Neutron @@ -131,9 +146,10 @@ applications: debug: true to: - '23' + channel: latest/edge nova-compute: - charm: cs:~openstack-charmers-next/nova-compute + charm: ch:nova-compute num_units: 3 constraints: mem=4G options: @@ -151,15 +167,17 @@ applications: - '8' - '9' - '10' + channel: latest/edge rabbitmq-server: - charm: cs:~openstack-charmers-next/rabbitmq-server + charm: ch:rabbitmq-server num_units: 1 to: - '11' + channel: latest/edge masakari: - charm: cs:~openstack-charmers-next/masakari + charm: ch:masakari num_units: 3 options: openstack-origin: *openstack-origin @@ -167,9 +185,10 @@ applications: - '12' - '13' - '14' + channel: latest/edge ceph-mon: - charm: cs:~openstack-charmers-next/ceph-mon + charm: ch:ceph-mon num_units: 3 options: source: *openstack-origin @@ -178,9 +197,10 @@ applications: - '15' - '16' - '17' + channel: latest/edge ceph-osd: - charm: cs:~openstack-charmers-next/ceph-osd + charm: ch:ceph-osd constraints: mem=1G num_units: 3 options: @@ -191,18 +211,21 @@ applications: - '18' - '19' - '20' + channel: latest/edge cinder-ceph: - charm: cs:~openstack-charmers-next/cinder-ceph + charm: ch:cinder-ceph + channel: latest/edge masakari-monitors: charm: ../../masakari-monitors hacluster: - charm: cs:~openstack-charmers-next/hacluster + charm: ch:hacluster options: corosync_transport: unicast cluster_count: 3 + channel: latest/edge pacemaker-remote: charm: cs:~openstack-charmers-next/pacemaker-remote @@ -212,17 +235,19 @@ applications: vault: num_units: 1 - charm: cs:~openstack-charmers-next/vault + charm: ch:vault to: - '21' + channel: latest/edge placement: - charm: cs:~openstack-charmers-next/placement + charm: ch:placement num_units: 1 options: openstack-origin: *openstack-origin to: - '22' + channel: latest/edge relations: diff --git a/src/tests/bundles/focal-yoga.yaml b/src/tests/bundles/focal-yoga.yaml index 2f41145..776c22a 100644 --- a/src/tests/bundles/focal-yoga.yaml +++ b/src/tests/bundles/focal-yoga.yaml @@ -40,24 +40,32 @@ machines: applications: keystone-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: ch:mysql-router + channel: latest/edge cinder-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: ch:mysql-router + channel: latest/edge neutron-api-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: ch:mysql-router + channel: latest/edge glance-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: ch:mysql-router + channel: latest/edge nova-cloud-controller-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: ch:mysql-router + channel: latest/edge masakari-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: ch:mysql-router + channel: latest/edge vault-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: ch:mysql-router + channel: latest/edge placement-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: ch:mysql-router + channel: latest/edge mysql-innodb-cluster: - charm: cs:~openstack-charmers-next/mysql-innodb-cluster + charm: ch:mysql-innodb-cluster num_units: 3 options: source: *openstack-origin @@ -65,18 +73,20 @@ applications: - '0' - '1' - '2' + channel: latest/edge glance: - charm: cs:~openstack-charmers-next/glance + charm: ch:glance num_units: 1 options: openstack-origin: *openstack-origin worker-multiplier: 0.25 to: - '3' + channel: latest/edge cinder: - charm: cs:~openstack-charmers-next/cinder + charm: ch:cinder num_units: 1 options: openstack-origin: *openstack-origin @@ -84,9 +94,10 @@ applications: glance-api-version: 2 to: - '4' + channel: latest/edge keystone: - charm: cs:~openstack-charmers-next/keystone + charm: ch:keystone num_units: 1 options: admin-password: openstack @@ -94,9 +105,10 @@ applications: worker-multiplier: 0.25 to: - '5' + 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 @@ -106,9 +118,10 @@ applications: worker-multiplier: 0.25 to: - '6' + channel: latest/edge neutron-gateway: - charm: cs:~openstack-charmers-next/neutron-gateway + charm: ch:neutron-gateway num_units: 1 options: bridge-mappings: physnet1:br-ex @@ -116,13 +129,15 @@ applications: worker-multiplier: 0.25 to: - '7' + channel: latest/edge neutron-openvswitch: - charm: cs:~openstack-charmers-next/neutron-openvswitch + charm: ch:neutron-openvswitch num_units: 0 + channel: latest/edge nova-cloud-controller: - charm: cs:~openstack-charmers-next/nova-cloud-controller + charm: ch:nova-cloud-controller num_units: 1 options: network-manager: Neutron @@ -131,9 +146,10 @@ applications: debug: true to: - '23' + channel: latest/edge nova-compute: - charm: cs:~openstack-charmers-next/nova-compute + charm: ch:nova-compute num_units: 3 constraints: mem=4G options: @@ -151,15 +167,17 @@ applications: - '8' - '9' - '10' + channel: latest/edge rabbitmq-server: - charm: cs:~openstack-charmers-next/rabbitmq-server + charm: ch:rabbitmq-server num_units: 1 to: - '11' + channel: latest/edge masakari: - charm: cs:~openstack-charmers-next/masakari + charm: ch:masakari num_units: 3 options: openstack-origin: *openstack-origin @@ -167,9 +185,10 @@ applications: - '12' - '13' - '14' + channel: latest/edge ceph-mon: - charm: cs:~openstack-charmers-next/ceph-mon + charm: ch:ceph-mon num_units: 3 options: source: *openstack-origin @@ -178,9 +197,10 @@ applications: - '15' - '16' - '17' + channel: latest/edge ceph-osd: - charm: cs:~openstack-charmers-next/ceph-osd + charm: ch:ceph-osd constraints: mem=1G num_units: 3 options: @@ -191,18 +211,21 @@ applications: - '18' - '19' - '20' + channel: latest/edge cinder-ceph: - charm: cs:~openstack-charmers-next/cinder-ceph + charm: ch:cinder-ceph + channel: latest/edge masakari-monitors: charm: ../../masakari-monitors hacluster: - charm: cs:~openstack-charmers-next/hacluster + charm: ch:hacluster options: corosync_transport: unicast cluster_count: 3 + channel: latest/edge pacemaker-remote: charm: cs:~openstack-charmers-next/pacemaker-remote @@ -212,17 +235,19 @@ applications: vault: num_units: 1 - charm: cs:~openstack-charmers-next/vault + charm: ch:vault to: - '21' + channel: latest/edge placement: - charm: cs:~openstack-charmers-next/placement + charm: ch:placement num_units: 1 options: openstack-origin: *openstack-origin to: - '22' + channel: latest/edge relations: diff --git a/src/tests/bundles/hirsute-wallaby.yaml b/src/tests/bundles/hirsute-wallaby.yaml deleted file mode 100644 index 7c01ef9..0000000 --- a/src/tests/bundles/hirsute-wallaby.yaml +++ /dev/null @@ -1,390 +0,0 @@ -variables: - openstack-origin: &openstack-origin distro - -series: hirsute - -comment: -- 'machines section to decide order of deployment. database sooner = faster' -machines: - '0': - constraints: mem=3072M - '1': - constraints: mem=3072M - '2': - constraints: mem=3072M - '3': - '4': - '5': - '6': - '7': - '8': - constraints: mem=4096M - '9': - constraints: mem=4096M - '10': - constraints: mem=4096M - '11': - '12': - '13': - '14': - '15': - '16': - '17': - '18': - '19': - '20': - '21': - '22': - '23': - -applications: - - keystone-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router - cinder-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router - neutron-api-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router - glance-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router - nova-cloud-controller-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router - masakari-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router - vault-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router - placement-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router - - mysql-innodb-cluster: - charm: cs:~openstack-charmers-next/mysql-innodb-cluster - num_units: 3 - options: - source: *openstack-origin - to: - - '0' - - '1' - - '2' - - glance: - charm: cs:~openstack-charmers-next/glance - num_units: 1 - options: - openstack-origin: *openstack-origin - worker-multiplier: 0.25 - to: - - '3' - - cinder: - charm: cs:~openstack-charmers-next/cinder - num_units: 1 - options: - openstack-origin: *openstack-origin - block-device: "None" - glance-api-version: 2 - to: - - '4' - - keystone: - charm: cs:~openstack-charmers-next/keystone - num_units: 1 - options: - admin-password: openstack - openstack-origin: *openstack-origin - worker-multiplier: 0.25 - to: - - '5' - - neutron-api: - charm: cs:~openstack-charmers-next/neutron-api - num_units: 1 - options: - manage-neutron-plugin-legacy-mode: true - flat-network-providers: physnet1 - neutron-security-groups: true - openstack-origin: *openstack-origin - worker-multiplier: 0.25 - to: - - '6' - - neutron-gateway: - charm: cs:~openstack-charmers-next/neutron-gateway - num_units: 1 - options: - bridge-mappings: physnet1:br-ex - openstack-origin: *openstack-origin - worker-multiplier: 0.25 - to: - - '7' - - neutron-openvswitch: - charm: cs:~openstack-charmers-next/neutron-openvswitch - num_units: 0 - - nova-cloud-controller: - charm: cs:~openstack-charmers-next/nova-cloud-controller - num_units: 1 - options: - network-manager: Neutron - openstack-origin: *openstack-origin - worker-multiplier: 0.25 - debug: true - to: - - '23' - - nova-compute: - charm: cs:~openstack-charmers-next/nova-compute - num_units: 3 - constraints: mem=4G - options: - config-flags: default_ephemeral_format=ext4 - enable-live-migration: true - enable-resize: true - migration-auth-type: ssh - openstack-origin: *openstack-origin - debug: true - cpu-model: kvm64 - cpu-mode: custom - # Allow for more retries when testing ontop of openstack - config-flags: block_device_allocate_retries=120 - to: - - '8' - - '9' - - '10' - - rabbitmq-server: - charm: cs:~openstack-charmers-next/rabbitmq-server - num_units: 1 - to: - - '11' - - masakari: - charm: cs:~openstack-charmers-next/masakari - num_units: 3 - options: - openstack-origin: *openstack-origin - to: - - '12' - - '13' - - '14' - - ceph-mon: - charm: cs:~openstack-charmers-next/ceph-mon - num_units: 3 - options: - source: *openstack-origin - expected-osd-count: 3 - to: - - '15' - - '16' - - '17' - - ceph-osd: - charm: cs:~openstack-charmers-next/ceph-osd - constraints: mem=1G - num_units: 3 - options: - source: *openstack-origin - storage: - osd-devices: cinder,40G - to: - - '18' - - '19' - - '20' - - cinder-ceph: - charm: cs:~openstack-charmers-next/cinder-ceph - - masakari-monitors: - charm: ../../masakari-monitors - - hacluster: - charm: cs:~openstack-charmers-next/hacluster - options: - corosync_transport: unicast - cluster_count: 3 - - pacemaker-remote: - charm: cs:~openstack-charmers-next/pacemaker-remote - options: - enable-stonith: False - enable-resources: False - - vault: - num_units: 1 - charm: cs:~openstack-charmers-next/vault - to: - - '21' - - placement: - charm: cs:~openstack-charmers-next/placement - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '22' - -relations: - - - - 'nova-compute:amqp' - - 'rabbitmq-server:amqp' - - - - 'neutron-gateway:amqp' - - 'rabbitmq-server:amqp' - - - - 'neutron-gateway:amqp-nova' - - 'rabbitmq-server:amqp' - - - - 'keystone:shared-db' - - 'keystone-mysql-router:shared-db' - - - 'keystone-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - - 'cinder:identity-service' - - 'keystone:identity-service' - - - - 'nova-cloud-controller:identity-service' - - 'keystone:identity-service' - - - - 'glance:identity-service' - - 'keystone:identity-service' - - - - 'neutron-api:identity-service' - - 'keystone:identity-service' - - - - 'neutron-openvswitch:neutron-plugin-api' - - 'neutron-api:neutron-plugin-api' - - - - 'cinder:shared-db' - - 'cinder-mysql-router:shared-db' - - - 'cinder-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - - 'neutron-api:shared-db' - - 'neutron-api-mysql-router:shared-db' - - - 'neutron-api-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - - 'cinder:amqp' - - 'rabbitmq-server:amqp' - - - - 'neutron-api:amqp' - - 'rabbitmq-server:amqp' - - - - 'neutron-gateway:neutron-plugin-api' - - 'neutron-api:neutron-plugin-api' - - - - 'glance:shared-db' - - 'glance-mysql-router:shared-db' - - - 'glance-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - - 'glance:amqp' - - 'rabbitmq-server:amqp' - - - - 'nova-cloud-controller:image-service' - - 'glance:image-service' - - - - 'nova-compute:image-service' - - 'glance:image-service' - - - - 'nova-cloud-controller:amqp' - - 'rabbitmq-server:amqp' - - - - 'nova-cloud-controller:quantum-network-service' - - 'neutron-gateway:quantum-network-service' - - - - 'nova-compute:neutron-plugin' - - 'neutron-openvswitch:neutron-plugin' - - - - 'neutron-openvswitch: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:neutron-api' - - 'neutron-api:neutron-api' - - - - 'nova-cloud-controller:cloud-compute' - - 'nova-compute:cloud-compute' - - - - 'masakari:shared-db' - - 'masakari-mysql-router:shared-db' - - - 'masakari-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - - 'masakari:amqp' - - 'rabbitmq-server:amqp' - - - - 'masakari:identity-service' - - 'keystone:identity-service' - - - - 'glance:ceph' - - 'ceph-mon:client' - - - - 'ceph-mon:osd' - - 'ceph-osd:mon' - - - - 'cinder:storage-backend' - - 'cinder-ceph:storage-backend' - - - - 'cinder-ceph:ceph' - - 'ceph-mon:client' - - - - 'cinder-ceph:ceph-access' - - 'nova-compute:ceph-access' - - - - 'nova-compute:juju-info' - - 'masakari-monitors:container' - - - - 'masakari:ha' - - 'hacluster:ha' - - - - 'keystone:identity-credentials' - - 'masakari-monitors:identity-credentials' - - - - 'nova-compute:juju-info' - - 'pacemaker-remote:juju-info' - - - - 'hacluster:pacemaker-remote' - - 'pacemaker-remote:pacemaker-remote' - - - - 'vault:shared-db' - - 'vault-mysql-router:shared-db' - - - 'vault-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - - 'vault:certificates' - - 'keystone:certificates' - - - - 'vault:certificates' - - 'neutron-api:certificates' - - - - 'vault:certificates' - - 'cinder:certificates' - - - - 'vault:certificates' - - 'glance:certificates' - - - - 'vault:certificates' - - 'nova-cloud-controller:certificates' - - - - 'vault:certificates' - - 'masakari:certificates' - - - - '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' - - - - 'vault:certificates' - - 'placement:certificates' diff --git a/src/tests/bundles/impish-xena.yaml b/src/tests/bundles/impish-xena.yaml index b24a22c..9d921ad 100644 --- a/src/tests/bundles/impish-xena.yaml +++ b/src/tests/bundles/impish-xena.yaml @@ -40,24 +40,32 @@ machines: applications: keystone-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: ch:mysql-router + channel: latest/edge cinder-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: ch:mysql-router + channel: latest/edge neutron-api-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: ch:mysql-router + channel: latest/edge glance-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: ch:mysql-router + channel: latest/edge nova-cloud-controller-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: ch:mysql-router + channel: latest/edge masakari-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: ch:mysql-router + channel: latest/edge vault-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: ch:mysql-router + channel: latest/edge placement-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: ch:mysql-router + channel: latest/edge mysql-innodb-cluster: - charm: cs:~openstack-charmers-next/mysql-innodb-cluster + charm: ch:mysql-innodb-cluster num_units: 3 options: source: *openstack-origin @@ -65,18 +73,20 @@ applications: - '0' - '1' - '2' + channel: latest/edge glance: - charm: cs:~openstack-charmers-next/glance + charm: ch:glance num_units: 1 options: openstack-origin: *openstack-origin worker-multiplier: 0.25 to: - '3' + channel: latest/edge cinder: - charm: cs:~openstack-charmers-next/cinder + charm: ch:cinder num_units: 1 options: openstack-origin: *openstack-origin @@ -84,9 +94,10 @@ applications: glance-api-version: 2 to: - '4' + channel: latest/edge keystone: - charm: cs:~openstack-charmers-next/keystone + charm: ch:keystone num_units: 1 options: admin-password: openstack @@ -94,9 +105,10 @@ applications: worker-multiplier: 0.25 to: - '5' + 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 @@ -106,9 +118,10 @@ applications: worker-multiplier: 0.25 to: - '6' + channel: latest/edge neutron-gateway: - charm: cs:~openstack-charmers-next/neutron-gateway + charm: ch:neutron-gateway num_units: 1 options: bridge-mappings: physnet1:br-ex @@ -116,13 +129,15 @@ applications: worker-multiplier: 0.25 to: - '7' + channel: latest/edge neutron-openvswitch: - charm: cs:~openstack-charmers-next/neutron-openvswitch + charm: ch:neutron-openvswitch num_units: 0 + channel: latest/edge nova-cloud-controller: - charm: cs:~openstack-charmers-next/nova-cloud-controller + charm: ch:nova-cloud-controller num_units: 1 options: network-manager: Neutron @@ -131,9 +146,10 @@ applications: debug: true to: - '23' + channel: latest/edge nova-compute: - charm: cs:~openstack-charmers-next/nova-compute + charm: ch:nova-compute num_units: 3 constraints: mem=4G options: @@ -151,15 +167,17 @@ applications: - '8' - '9' - '10' + channel: latest/edge rabbitmq-server: - charm: cs:~openstack-charmers-next/rabbitmq-server + charm: ch:rabbitmq-server num_units: 1 to: - '11' + channel: latest/edge masakari: - charm: cs:~openstack-charmers-next/masakari + charm: ch:masakari num_units: 3 options: openstack-origin: *openstack-origin @@ -167,9 +185,10 @@ applications: - '12' - '13' - '14' + channel: latest/edge ceph-mon: - charm: cs:~openstack-charmers-next/ceph-mon + charm: ch:ceph-mon num_units: 3 options: source: *openstack-origin @@ -178,9 +197,10 @@ applications: - '15' - '16' - '17' + channel: latest/edge ceph-osd: - charm: cs:~openstack-charmers-next/ceph-osd + charm: ch:ceph-osd constraints: mem=1G num_units: 3 options: @@ -191,18 +211,21 @@ applications: - '18' - '19' - '20' + channel: latest/edge cinder-ceph: - charm: cs:~openstack-charmers-next/cinder-ceph + charm: ch:cinder-ceph + channel: latest/edge masakari-monitors: charm: ../../masakari-monitors hacluster: - charm: cs:~openstack-charmers-next/hacluster + charm: ch:hacluster options: corosync_transport: unicast cluster_count: 3 + channel: latest/edge pacemaker-remote: charm: cs:~openstack-charmers-next/pacemaker-remote @@ -212,17 +235,19 @@ applications: vault: num_units: 1 - charm: cs:~openstack-charmers-next/vault + charm: ch:vault to: - '21' + channel: latest/edge placement: - charm: cs:~openstack-charmers-next/placement + charm: ch:placement num_units: 1 options: openstack-origin: *openstack-origin to: - '22' + channel: latest/edge relations: diff --git a/src/tests/bundles/jammy-yoga.yaml b/src/tests/bundles/jammy-yoga.yaml index dfdb171..621dceb 100644 --- a/src/tests/bundles/jammy-yoga.yaml +++ b/src/tests/bundles/jammy-yoga.yaml @@ -40,24 +40,32 @@ machines: applications: keystone-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: ch:mysql-router + channel: latest/edge cinder-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: ch:mysql-router + channel: latest/edge neutron-api-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: ch:mysql-router + channel: latest/edge glance-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: ch:mysql-router + channel: latest/edge nova-cloud-controller-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: ch:mysql-router + channel: latest/edge masakari-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: ch:mysql-router + channel: latest/edge vault-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: ch:mysql-router + channel: latest/edge placement-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: ch:mysql-router + channel: latest/edge mysql-innodb-cluster: - charm: cs:~openstack-charmers-next/mysql-innodb-cluster + charm: ch:mysql-innodb-cluster num_units: 3 options: source: *openstack-origin @@ -65,18 +73,20 @@ applications: - '0' - '1' - '2' + channel: latest/edge glance: - charm: cs:~openstack-charmers-next/glance + charm: ch:glance num_units: 1 options: openstack-origin: *openstack-origin worker-multiplier: 0.25 to: - '3' + channel: latest/edge cinder: - charm: cs:~openstack-charmers-next/cinder + charm: ch:cinder num_units: 1 options: openstack-origin: *openstack-origin @@ -84,9 +94,10 @@ applications: glance-api-version: 2 to: - '4' + channel: latest/edge keystone: - charm: cs:~openstack-charmers-next/keystone + charm: ch:keystone num_units: 1 options: admin-password: openstack @@ -94,9 +105,10 @@ applications: worker-multiplier: 0.25 to: - '5' + 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 @@ -106,9 +118,10 @@ applications: worker-multiplier: 0.25 to: - '6' + channel: latest/edge neutron-gateway: - charm: cs:~openstack-charmers-next/neutron-gateway + charm: ch:neutron-gateway num_units: 1 options: bridge-mappings: physnet1:br-ex @@ -116,13 +129,15 @@ applications: worker-multiplier: 0.25 to: - '7' + channel: latest/edge neutron-openvswitch: - charm: cs:~openstack-charmers-next/neutron-openvswitch + charm: ch:neutron-openvswitch num_units: 0 + channel: latest/edge nova-cloud-controller: - charm: cs:~openstack-charmers-next/nova-cloud-controller + charm: ch:nova-cloud-controller num_units: 1 options: network-manager: Neutron @@ -131,9 +146,10 @@ applications: debug: true to: - '23' + channel: latest/edge nova-compute: - charm: cs:~openstack-charmers-next/nova-compute + charm: ch:nova-compute num_units: 3 constraints: mem=4G options: @@ -151,15 +167,17 @@ applications: - '8' - '9' - '10' + channel: latest/edge rabbitmq-server: - charm: cs:~openstack-charmers-next/rabbitmq-server + charm: ch:rabbitmq-server num_units: 1 to: - '11' + channel: latest/edge masakari: - charm: cs:~openstack-charmers-next/masakari + charm: ch:masakari num_units: 3 options: openstack-origin: *openstack-origin @@ -167,9 +185,10 @@ applications: - '12' - '13' - '14' + channel: latest/edge ceph-mon: - charm: cs:~openstack-charmers-next/ceph-mon + charm: ch:ceph-mon num_units: 3 options: source: *openstack-origin @@ -178,9 +197,10 @@ applications: - '15' - '16' - '17' + channel: latest/edge ceph-osd: - charm: cs:~openstack-charmers-next/ceph-osd + charm: ch:ceph-osd constraints: mem=1G num_units: 3 options: @@ -191,18 +211,21 @@ applications: - '18' - '19' - '20' + channel: latest/edge cinder-ceph: - charm: cs:~openstack-charmers-next/cinder-ceph + charm: ch:cinder-ceph + channel: latest/edge masakari-monitors: charm: ../../masakari-monitors hacluster: - charm: cs:~openstack-charmers-next/hacluster + charm: ch:hacluster options: corosync_transport: unicast cluster_count: 3 + channel: latest/edge pacemaker-remote: charm: cs:~openstack-charmers-next/pacemaker-remote @@ -212,17 +235,19 @@ applications: vault: num_units: 1 - charm: cs:~openstack-charmers-next/vault + charm: ch:vault to: - '21' + channel: latest/edge placement: - charm: cs:~openstack-charmers-next/placement + charm: ch:placement num_units: 1 options: openstack-origin: *openstack-origin to: - '22' + channel: latest/edge relations: diff --git a/src/tests/tests.yaml b/src/tests/tests.yaml index 8fd0996..a418888 100644 --- a/src/tests/tests.yaml +++ b/src/tests/tests.yaml @@ -13,25 +13,17 @@ configure: - zaza.openstack.charm_tests.masakari.setup.create_segments gate_bundles: - - bionic-stein - - bionic-ussuri - - focal-ussuri - - focal-victoria - - focal-wallaby - focal-xena - - hirsute-wallaby - impish-xena dev_bundles: # Rocky disabled until https://review.opendev.org/#/c/647756/ lands in # packaging - - bionic-rocky - - bionic-train - focal-yoga - jammy-yoga smoke_bundles: - - focal-ussuri + - focal-xena target_deploy_status: easyrsa: @@ -52,6 +44,5 @@ target_deploy_status: tests_options: force_deploy: - - hirsute-wallaby - impish-xena - jammy-yoga