From 555538096c722bcd9db5bcaee369af3315859111 Mon Sep 17 00:00:00 2001 From: Corey Bryant Date: Tue, 18 Jul 2023 16:47:19 -0400 Subject: [PATCH] Add 2023.2 Bobcat support * sync charm-helpers to classic charms * change openstack-origin/source default to bobcat * add mantic to metadata series * align testing with bobcat * add new bobcat bundles * add bobcat bundles to tests.yaml * add bobcat tests to osci.yaml * update build-on and run-on bases * drop kinetic Change-Id: Id19c8f02dfcf366b1bbc7994adfccff64e314761 --- charmcraft.yaml | 6 +- metadata.yaml | 2 +- .../{jammy-zed.yaml => jammy-bobcat.yaml} | 2 +- tests/bundles/mantic-bobcat.yaml | 246 ++++++++++++++++++ tests/tests.yaml | 8 +- 5 files changed, 256 insertions(+), 8 deletions(-) rename tests/bundles/{jammy-zed.yaml => jammy-bobcat.yaml} (99%) create mode 100644 tests/bundles/mantic-bobcat.yaml diff --git a/charmcraft.yaml b/charmcraft.yaml index 12551d5..9a9ac47 100644 --- a/charmcraft.yaml +++ b/charmcraft.yaml @@ -29,9 +29,9 @@ bases: - name: ubuntu channel: "22.04" architectures: [amd64, s390x, ppc64el, arm64] - - name: ubuntu - channel: "22.10" - architectures: [amd64, s390x, ppc64el, arm64] - name: ubuntu channel: "23.04" architectures: [amd64, s390x, ppc64el, arm64] + - name: ubuntu + channel: "23.10" + architectures: [amd64, s390x, ppc64el, arm64] diff --git a/metadata.yaml b/metadata.yaml index 820b32f..4f26830 100644 --- a/metadata.yaml +++ b/metadata.yaml @@ -17,8 +17,8 @@ tags: - file-servers series: - jammy - - kinetic - lunar + - mantic subordinate: true provides: manila-plugin: diff --git a/tests/bundles/jammy-zed.yaml b/tests/bundles/jammy-bobcat.yaml similarity index 99% rename from tests/bundles/jammy-zed.yaml rename to tests/bundles/jammy-bobcat.yaml index 43d22c5..b6bacaf 100644 --- a/tests/bundles/jammy-zed.yaml +++ b/tests/bundles/jammy-bobcat.yaml @@ -1,5 +1,5 @@ variables: - openstack-origin: &openstack-origin cloud:jammy-zed + openstack-origin: &openstack-origin cloud:jammy-bobcat local_overlay_enabled: True diff --git a/tests/bundles/mantic-bobcat.yaml b/tests/bundles/mantic-bobcat.yaml new file mode 100644 index 0000000..6c207a5 --- /dev/null +++ b/tests/bundles/mantic-bobcat.yaml @@ -0,0 +1,246 @@ +variables: + openstack-origin: &openstack-origin distro + +local_overlay_enabled: True + +series: mantic + +comment: +- 'machines section to decide order of deployment. database sooner = faster' +machines: + '0': + constraints: mem=3072M + '1': + constraints: mem=3072M + '2': + constraints: mem=3072M + '3': + '4': + '5': + '6': + '7': + '8': + '9': + # The following units are the nova compute units + '10': + constraints: mem=4G + '11': + constraints: mem=4G + '12': + +applications: + manila-mysql-router: + charm: ch:mysql-router + channel: latest/edge + keystone-mysql-router: + charm: ch:mysql-router + channel: latest/edge + neutron-api-mysql-router: + charm: ch:mysql-router + channel: latest/edge + nova-cloud-controller-mysql-router: + charm: ch:mysql-router + channel: latest/edge + glance-mysql-router: + charm: ch:mysql-router + channel: latest/edge + placement-mysql-router: + charm: ch:mysql-router + channel: latest/edge + + mysql-innodb-cluster: + charm: ch:mysql-innodb-cluster + num_units: 3 + options: + source: *openstack-origin + to: + - '0' + - '1' + - '2' + channel: latest/edge + + nova-cloud-controller: + charm: ch:nova-cloud-controller + num_units: 1 + options: + network-manager: Neutron + openstack-origin: *openstack-origin + to: + - '3' + channel: latest/edge + + glance: + charm: ch:glance + num_units: 1 + options: + openstack-origin: *openstack-origin + to: + - '4' + channel: latest/edge + + neutron-api: + charm: ch:neutron-api + num_units: 1 + options: + openstack-origin: *openstack-origin + manage-neutron-plugin-legacy-mode: true + neutron-plugin: ovs + flat-network-providers: physnet1 + neutron-security-groups: true + to: + - '5' + channel: latest/edge + + neutron-openvswitch: + charm: ch:neutron-openvswitch + channel: latest/edge + + neutron-gateway: + charm: ch:neutron-gateway + num_units: 1 + options: + openstack-origin: *openstack-origin + bridge-mappings: physnet1:br-ex + to: + - '6' + channel: latest/edge + + keystone: + charm: ch:keystone + num_units: 1 + options: + openstack-origin: *openstack-origin + to: + - '7' + channel: latest/edge + + rabbitmq-server: + charm: ch:rabbitmq-server + num_units: 1 + to: + - '8' + channel: latest/edge + + placement: + charm: ch:placement + num_units: 1 + options: + openstack-origin: *openstack-origin + to: + - '9' + channel: latest/edge + + nova-compute: + charm: ch:nova-compute + num_units: 2 + storage: + ephemeral-device: '40G' + options: + openstack-origin: *openstack-origin + config-flags: default_ephemeral_format=ext4 + to: + - '10' + - '11' + channel: latest/edge + + manila: + charm: ch:manila + num_units: 1 + options: + openstack-origin: *openstack-origin + default-share-backend: netapp-ontap + to: + - '12' + channel: latest/edge + + manila-netapp: + charm: ../../manila-netapp.charm + options: + share-backend-name: netapp-ontap + driver-handles-share-servers: False + + manila-netapp-dhss: + charm: ../../manila-netapp.charm + options: + share-backend-name: netapp-ontap-dhss + driver-handles-share-servers: True + +relations: + - - 'manila:shared-db' + - 'manila-mysql-router:shared-db' + - - 'manila-mysql-router:db-router' + - 'mysql-innodb-cluster:db-router' + - - 'manila' + - 'rabbitmq-server' + - - 'manila' + - 'keystone' + - - 'manila:manila-plugin' + - 'manila-netapp:manila-plugin' + - - 'manila:manila-plugin' + - 'manila-netapp-dhss:manila-plugin' + + - - 'keystone:shared-db' + - 'keystone-mysql-router:shared-db' + - - 'keystone-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' + - - 'neutron-api:amqp' + - 'rabbitmq-server:amqp' + - - 'neutron-api:identity-service' + - 'keystone:identity-service' + - - 'neutron-api:neutron-api' + - 'nova-cloud-controller:neutron-api' + - - 'neutron-api:neutron-plugin-api' + - 'neutron-gateway:neutron-plugin-api' + + - - '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:amqp' + - 'rabbitmq-server:amqp' + - - 'nova-cloud-controller:identity-service' + - 'keystone:identity-service' + - - 'nova-cloud-controller:cloud-compute' + - 'nova-compute:cloud-compute' + - - 'nova-cloud-controller:image-service' + - 'glance:image-service' + - - 'nova-cloud-controller:quantum-network-service' + - 'neutron-gateway:quantum-network-service' + + - - 'nova-compute:amqp' + - 'rabbitmq-server:amqp' + - - 'nova-compute:image-service' + - 'glance:image-service' + - - 'nova-compute:neutron-plugin' + - 'neutron-openvswitch:neutron-plugin' + + - - 'neutron-gateway:amqp' + - 'rabbitmq-server:amqp' + + - - 'neutron-openvswitch:amqp' + - 'rabbitmq-server:amqp' + + - - 'glance:shared-db' + - 'glance-mysql-router:shared-db' + - - 'glance-mysql-router:db-router' + - 'mysql-innodb-cluster:db-router' + - - 'glance:amqp' + - 'rabbitmq-server:amqp' + - - 'glance:identity-service' + - 'keystone:identity-service' + + - - 'placement:shared-db' + - 'placement-mysql-router:shared-db' + - - 'placement-mysql-router:db-router' + - 'mysql-innodb-cluster:db-router' + - - 'placement:amqp' + - 'rabbitmq-server:amqp' + - - 'placement:identity-service' + - 'keystone:identity-service' + - - 'placement:placement' + - 'nova-cloud-controller:placement' diff --git a/tests/tests.yaml b/tests/tests.yaml index 4a286d6..8a3cf4b 100644 --- a/tests/tests.yaml +++ b/tests/tests.yaml @@ -1,16 +1,17 @@ charm_name: manila-netapp gate_bundles: - - jammy-zed + - jammy-antelope dev_bundles: - - jammy-antelope + - jammy-bobcat - lunar-antelope + - mantic-bobcat # WARNING(lourot): func-smoke has been temporarily disabled in tox.ini. See # rationale there. smoke_bundles: - - jammy-zed + - jammy-antelope target_deploy_status: {} @@ -31,4 +32,5 @@ tests: tests_options: force_deploy: - lunar-antelope + - mantic-bobcat