diff --git a/.zuul.yaml b/.zuul.yaml index 23bf5f6..fd20909 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -1,4 +1,4 @@ - project: templates: - - openstack-python3-charm-zed-jobs + - openstack-python3-charm-jobs - openstack-cover-jobs diff --git a/charmcraft.yaml b/charmcraft.yaml index 0604425..e34793a 100644 --- a/charmcraft.yaml +++ b/charmcraft.yaml @@ -23,3 +23,6 @@ bases: - name: ubuntu channel: "22.10" architectures: [amd64, s390x, ppc64el, arm64] + - name: ubuntu + channel: "23.04" + architectures: [amd64, s390x, ppc64el, arm64] diff --git a/osci.yaml b/osci.yaml index 917f050..73d240e 100644 --- a/osci.yaml +++ b/osci.yaml @@ -1,7 +1,7 @@ - project: templates: - charm-unit-jobs-py310 - - charm-zed-functional-jobs + - charm-functional-jobs vars: needs_charm_build: true charm_build_name: placement diff --git a/src/config.yaml b/src/config.yaml index afeaf00..106d3ad 100644 --- a/src/config.yaml +++ b/src/config.yaml @@ -1,3 +1,3 @@ options: openstack-origin: - default: zed + default: antelope diff --git a/src/metadata.yaml b/src/metadata.yaml index a971927..fd3aa82 100644 --- a/src/metadata.yaml +++ b/src/metadata.yaml @@ -12,6 +12,7 @@ tags: series: - jammy - kinetic +- lunar subordinate: false requires: shared-db: diff --git a/src/tests/bundles/jammy-antelope.yaml b/src/tests/bundles/jammy-antelope.yaml new file mode 100644 index 0000000..432994a --- /dev/null +++ b/src/tests/bundles/jammy-antelope.yaml @@ -0,0 +1,255 @@ +variables: + openstack-origin: &openstack-origin cloud:jammy-antelope + +local_overlay_enabled: False + +series: jammy + +comment: +- 'machines section to decide order of deployment. database sooner = faster' +machines: + '0': + constraints: mem=3072M + '1': + constraints: mem=3072M + '2': + constraints: mem=3072M + '3': + '4': + '5': + '6': + '7': + '8': + '9': + '10': + '11': + + +applications: + + keystone-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 + neutron-api-mysql-router: + charm: ch:mysql-router + channel: latest/edge + placement-mysql-router: + charm: ch:mysql-router + channel: latest/edge + vault-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 + + rabbitmq-server: + charm: ch:rabbitmq-server + num_units: 1 + constraints: mem=1G + to: + - '3' + channel: latest/edge + + glance: + charm: ch:glance + num_units: 1 + constraints: mem=1G + options: + openstack-origin: *openstack-origin + to: + - '4' + channel: latest/edge + + keystone: + charm: ch:keystone + num_units: 1 + options: + openstack-origin: *openstack-origin + admin-password: openstack + to: + - '5' + 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: + - '6' + 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: + - '7' + channel: latest/edge + + nova-cloud-controller: + charm: ch:nova-cloud-controller + num_units: 1 + options: + openstack-origin: *openstack-origin + network-manager: Neutron + debug: true + to: + - '8' + channel: latest/edge + + nova-compute: + charm: ch:nova-compute + num_units: 1 + constraints: mem=4G + options: + openstack-origin: *openstack-origin + enable-live-migration: true + enable-resize: true + migration-auth-type: ssh + debug: true + to: + - '9' + channel: latest/edge + + placement: + charm: ../../../placement.charm + num_units: 1 + constraints: mem=1G + options: + openstack-origin: *openstack-origin + debug: true + to: + - '10' + + vault: + num_units: 1 + charm: ch:vault + to: + - '11' + channel: latest/edge + +relations: + + - - 'keystone:shared-db' + - 'keystone-mysql-router:shared-db' + - - 'keystone-mysql-router:db-router' + - 'mysql-innodb-cluster:db-router' + + - - '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' + - 'glance' + + - - 'nova-cloud-controller' + - 'keystone' + + - - 'nova-compute' + - 'nova-cloud-controller' + + - - 'nova-compute' + - 'rabbitmq-server:amqp' + + - - 'nova-compute' + - 'glance' + + - - 'glance:shared-db' + - 'glance-mysql-router:shared-db' + - - 'glance-mysql-router:db-router' + - 'mysql-innodb-cluster:db-router' + + - - 'glance' + - 'keystone' + + - - 'glance' + - 'rabbitmq-server' + + - - 'neutron-gateway' + - 'nova-cloud-controller' + + - - 'neutron-gateway:amqp' + - 'rabbitmq-server' + + - - 'neutron-api:shared-db' + - 'neutron-api-mysql-router:shared-db' + - - 'neutron-api-mysql-router:db-router' + - 'mysql-innodb-cluster:db-router' + + - - 'neutron-api' + - 'rabbitmq-server' + + - - 'neutron-api' + - 'nova-cloud-controller' + + - - 'neutron-api' + - 'neutron-openvswitch' + + - - 'neutron-api' + - 'keystone' + + - - 'neutron-api' + - 'neutron-gateway' + + - - 'neutron-openvswitch' + - 'nova-compute' + + - - 'neutron-openvswitch' + - 'rabbitmq-server' + + - - 'placement:shared-db' + - 'placement-mysql-router:shared-db' + - - 'placement-mysql-router:db-router' + - 'mysql-innodb-cluster:db-router' + + - - 'placement' + - 'keystone' + + - - 'placement' + - 'nova-cloud-controller' + + - - 'vault:shared-db' + - 'vault-mysql-router:shared-db' + - - 'vault-mysql-router:db-router' + - 'mysql-innodb-cluster:db-router' + + - - 'vault:certificates' + - 'keystone:certificates' + - - 'vault:certificates' + - 'placement:certificates' + - - 'vault:certificates' + - 'neutron-api:certificates' + - - 'vault:certificates' + - 'glance:certificates' + - - 'vault:certificates' + - 'nova-cloud-controller:certificates' diff --git a/src/tests/bundles/jammy-yoga.yaml b/src/tests/bundles/lunar-antelope.yaml similarity index 99% rename from src/tests/bundles/jammy-yoga.yaml rename to src/tests/bundles/lunar-antelope.yaml index 45a487f..e0d1769 100644 --- a/src/tests/bundles/jammy-yoga.yaml +++ b/src/tests/bundles/lunar-antelope.yaml @@ -3,7 +3,7 @@ variables: local_overlay_enabled: False -series: jammy +series: lunar comment: - 'machines section to decide order of deployment. database sooner = faster' diff --git a/src/tests/tests.yaml b/src/tests/tests.yaml index 4e53375..f37f43c 100644 --- a/src/tests/tests.yaml +++ b/src/tests/tests.yaml @@ -17,16 +17,17 @@ configure: - zaza.openstack.charm_tests.nova.setup.manage_ssh_key gate_bundles: - - jammy-yoga + - jammy-zed smoke_bundles: - - jammy-yoga + - jammy-zed dev_bundles: - - jammy-yoga - - jammy-zed + - jammy-antelope - kinetic-zed + - lunar-antelope tests_options: force_deploy: - kinetic-zed + - lunar-antelope diff --git a/tox.ini b/tox.ini index 854d8be..c11375e 100644 --- a/tox.ini +++ b/tox.ini @@ -33,7 +33,7 @@ allowlist_externals = charmcraft bash tox - rename.sh + {toxinidir}/rename.sh deps = -r{toxinidir}/requirements.txt