Add charmcraft 3 support

Update the charmcraft.yaml file to use base and platforms, only
allowing noble support.

- Update config to default to caracal.
- Update osci.yaml to use the charmcraft 3.x/beta
- Add noble/oracular to charmhelpers
- Drop non-noble tests

Change-Id: I225d54ebf2662dce3233efd4185550af989867bc
This commit is contained in:
Billy Olsen 2024-06-21 17:07:53 -07:00 committed by Billy Olsen
parent 6ba683d23e
commit 657ffe159d
No known key found for this signature in database
GPG Key ID: 6A8CA9BDB5995260
10 changed files with 30 additions and 793 deletions

View File

@ -5,20 +5,24 @@ parts:
source: src/ source: src/
plugin: reactive plugin: reactive
build-packages: build-packages:
- libpython3-dev - libpython3-dev
build-snaps: build-snaps:
- charm - charm/latest/edge
build-environment: build-environment:
- CHARM_INTERFACES_DIR: /root/project/interfaces/ - CHARM_INTERFACES_DIR: /root/project/interfaces/
- CHARM_LAYERS_DIR: /root/project/layers/ - CHARM_LAYERS_DIR: /root/project/layers/
bases: base: ubuntu@24.04
- build-on: platforms:
- name: ubuntu amd64:
channel: "22.04" build-on: amd64
architectures: build-for: amd64
- amd64 arm64:
run-on: build-on: arm64
- name: ubuntu build-for: arm64
channel: "22.04" ppc64el:
architectures: [amd64, s390x, ppc64el, arm64] build-on: ppc64el
build-for: ppc64el
s390x:
build-on: s390x
build-for: s390x

View File

@ -6,7 +6,6 @@
# NOTE(lourot): This might look like a duplication of test-requirements.txt but # NOTE(lourot): This might look like a duplication of test-requirements.txt but
# some tox targets use only test-requirements.txt whereas charm-build uses only # some tox targets use only test-requirements.txt whereas charm-build uses only
# requirements.txt # requirements.txt
setuptools<50.0.0 # https://github.com/pypa/setuptools/commit/04e3df22df840c6bb244e9b27bc56750c44b7c85
# NOTE: newer versions of cryptography require a Rust compiler to build, # NOTE: newer versions of cryptography require a Rust compiler to build,
# see # see

View File

@ -1,3 +1,3 @@
options: options:
openstack-origin: openstack-origin:
default: bobcat default: caracal

View File

@ -1,255 +0,0 @@
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: 2024.1/edge
keystone:
charm: ch:keystone
num_units: 1
options:
openstack-origin: *openstack-origin
admin-password: openstack
to:
- '5'
channel: 2024.1/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: 2024.1/edge
neutron-openvswitch:
charm: ch:neutron-openvswitch
channel: 2024.1/edge
neutron-gateway:
charm: ch:neutron-gateway
num_units: 1
options:
openstack-origin: *openstack-origin
bridge-mappings: physnet1:br-ex
to:
- '7'
channel: 2024.1/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: 2024.1/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: 2024.1/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'

View File

@ -1,255 +0,0 @@
variables:
openstack-origin: &openstack-origin cloud:jammy-bobcat
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: 2024.1/edge
keystone:
charm: ch:keystone
num_units: 1
options:
openstack-origin: *openstack-origin
admin-password: openstack
to:
- '5'
channel: 2024.1/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: 2024.1/edge
neutron-openvswitch:
charm: ch:neutron-openvswitch
channel: 2024.1/edge
neutron-gateway:
charm: ch:neutron-gateway
num_units: 1
options:
openstack-origin: *openstack-origin
bridge-mappings: physnet1:br-ex
to:
- '7'
channel: 2024.1/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: 2024.1/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: 2024.1/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'

View File

@ -1,255 +0,0 @@
variables:
openstack-origin: &openstack-origin cloud:jammy-caracal
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: 2024.1/edge
keystone:
charm: ch:keystone
num_units: 1
options:
openstack-origin: *openstack-origin
admin-password: openstack
to:
- '5'
channel: 2024.1/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: 2024.1/edge
neutron-openvswitch:
charm: ch:neutron-openvswitch
channel: 2024.1/edge
neutron-gateway:
charm: ch:neutron-gateway
num_units: 1
options:
openstack-origin: *openstack-origin
bridge-mappings: physnet1:br-ex
to:
- '7'
channel: 2024.1/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: 2024.1/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: 2024.1/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'

View File

@ -73,7 +73,7 @@ applications:
openstack-origin: *openstack-origin openstack-origin: *openstack-origin
to: to:
- '4' - '4'
channel: 2024.1/edge channel: latest/edge
keystone: keystone:
charm: ch:keystone charm: ch:keystone
@ -83,7 +83,7 @@ applications:
admin-password: openstack admin-password: openstack
to: to:
- '5' - '5'
channel: 2024.1/edge channel: latest/edge
neutron-api: neutron-api:
charm: ch:neutron-api charm: ch:neutron-api
@ -96,11 +96,11 @@ applications:
neutron-security-groups: true neutron-security-groups: true
to: to:
- '6' - '6'
channel: 2024.1/edge channel: latest/edge
neutron-openvswitch: neutron-openvswitch:
charm: ch:neutron-openvswitch charm: ch:neutron-openvswitch
channel: 2024.1/edge channel: latest/edge
neutron-gateway: neutron-gateway:
charm: ch:neutron-gateway charm: ch:neutron-gateway
@ -110,7 +110,7 @@ applications:
bridge-mappings: physnet1:br-ex bridge-mappings: physnet1:br-ex
to: to:
- '7' - '7'
channel: 2024.1/edge channel: latest/edge
nova-cloud-controller: nova-cloud-controller:
charm: ch:nova-cloud-controller charm: ch:nova-cloud-controller
@ -121,7 +121,7 @@ applications:
debug: true debug: true
to: to:
- '8' - '8'
channel: 2024.1/edge channel: latest/edge
nova-compute: nova-compute:
charm: ch:nova-compute charm: ch:nova-compute
@ -135,7 +135,7 @@ applications:
debug: true debug: true
to: to:
- '9' - '9'
channel: 2024.1/edge channel: latest/edge
placement: placement:
charm: ../../../placement.charm charm: ../../../placement.charm

View File

@ -17,11 +17,9 @@ configure:
- zaza.openstack.charm_tests.nova.setup.manage_ssh_key - zaza.openstack.charm_tests.nova.setup.manage_ssh_key
gate_bundles: gate_bundles:
- jammy-antelope - noble-caracal
- jammy-bobcat
- jammy-caracal
smoke_bundles: smoke_bundles:
- jammy-caracal - noble-caracal
dev_bundles: dev_bundles:
- noble-caracal - noble-caracal
tests_options: tests_options:

View File

@ -1,4 +1,6 @@
git+https://github.com/wolsen/charms.reactive.git@fix-entry-points#egg=charms.reactive
git+https://github.com/openstack/charms.openstack.git#egg=charms.openstack git+https://github.com/openstack/charms.openstack.git#egg=charms.openstack
git+https://github.com/juju/charm-helpers.git#egg=charmhelpers git+https://github.com/juju/charm-helpers.git#egg=charmhelpers

View File

@ -4,7 +4,6 @@
# https://github.com/openstack-charmers/release-tools # https://github.com/openstack-charmers/release-tools
# #
pyparsing<3.0.0 # aodhclient is pinned in zaza and needs pyparsing < 3.0.0, but cffi also needs it, so pin here. pyparsing<3.0.0 # aodhclient is pinned in zaza and needs pyparsing < 3.0.0, but cffi also needs it, so pin here.
setuptools<50.0.0 # https://github.com/pypa/setuptools/commit/04e3df22df840c6bb244e9b27bc56750c44b7c85
stestr>=2.2.0 stestr>=2.2.0