openstack/charm-ironic-conductor
Code Issues Proposed changes

Add 2023.2 Bobcat support

Browse Source 
* 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
* drop setuptools-scm and Cython from wheelhouse as
  they are already in layer-basic wheelhouse.
* update charmcraft_channel to 2.x/edge

Change-Id: I85266c6dd187b3584331330701ac97f0acb31b7f
This commit is contained in:
Corey Bryant 2023-07-18 16:47:18 -04:00
parent 6241b061bd
commit 1ceb18ce1a
10 changed files with 380 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

86
charmcraft.yaml
View File

@ -30,51 +30,91 @@ bases:
- name: ubuntu
channel: "22.04"
architectures: [amd64]
- build-on:
- name: ubuntu
channel: "22.10"
channel: "22.04"
architectures: [s390x]
run-on:
- name: ubuntu
channel: "22.04"
architectures: [s390x]
- build-on:
- name: ubuntu
channel: "22.04"
architectures: [ppc64el]
run-on:
- name: ubuntu
channel: "22.04"
architectures: [ppc64el]
- build-on:
- name: ubuntu
channel: "22.04"
architectures: [arm64]
run-on:
- name: ubuntu
channel: "22.04"
architectures: [arm64]
- build-on:
- name: ubuntu
channel: "23.04"
architectures: [amd64]
run-on:
- name: ubuntu
channel: "23.04"
architectures: [amd64]
- build-on:
- name: ubuntu
channel: "22.04"
architectures: [arm64]
channel: "23.04"
architectures: [s390x]
run-on:
- name: ubuntu
channel: "22.04"
architectures: [arm64]
- name: ubuntu
channel: "22.10"
architectures: [arm64]
- name: ubuntu
channel: "23.04"
architectures: [arm64]
architectures: [s390x]
- build-on:
- name: ubuntu
channel: "22.04"
channel: "23.04"
architectures: [ppc64el]
run-on:
- name: ubuntu
channel: "22.04"
architectures: [ppc64el]
- name: ubuntu
channel: "22.10"
architectures: [ppc64el]
- name: ubuntu
channel: "23.04"
architectures: [ppc64el]
- build-on:
- name: ubuntu
channel: "22.04"
channel: "23.04"
architectures: [arm64]
run-on:
- name: ubuntu
channel: "23.04"
architectures: [arm64]
- build-on:
- name: ubuntu
channel: "23.10"
architectures: [amd64]
run-on:
- name: ubuntu
channel: "23.10"
architectures: [amd64]
- build-on:
- name: ubuntu
channel: "23.10"
architectures: [s390x]
run-on:
- name: ubuntu
channel: "22.04"
channel: "23.10"
architectures: [s390x]
- build-on:
- name: ubuntu
channel: "22.10"
architectures: [s390x]
channel: "23.10"
architectures: [ppc64el]
run-on:
- name: ubuntu
channel: "23.04"
architectures: [s390x]
channel: "23.10"
architectures: [ppc64el]
- build-on:
- name: ubuntu
channel: "23.10"
architectures: [arm64]
run-on:
- name: ubuntu
channel: "23.10"
architectures: [arm64]

2
osci.yaml
View File

@ -6,4 +6,4 @@
needs_charm_build: true
charm_build_name: ironic-conductor
build_type: charmcraft
charmcraft_channel: 2.1/stable
charmcraft_channel: 2.x/edge

2
src/config.yaml
View File

@ -1,6 +1,6 @@
options:
openstack-origin:
default: antelope
default: bobcat
type: string
description: |
Repository from which to install. May be one of the following:

2
src/metadata.yaml
View File

@ -14,8 +14,8 @@ tags:
- baremetal
series:
- jammy
- kinetic
- lunar
- mantic
extra-bindings:
deployment:
cleaning:

2
src/tests/bundles/jammy-antelope.yaml
View File

@ -281,7 +281,7 @@ services:
openstack-origin: *source
channel: latest/edge
ironic-conductor:
charm: ../../../ironic-conductor_ubuntu-22.04-amd64_ubuntu-22.10-amd64_ubuntu-23.04-amd64.charm
charm: ../../../ironic-conductor_ubuntu-22.04-amd64.charm
num_units: 1
constraints: mem=2G
options:

4
src/tests/bundles/jammy-zed.yaml → src/tests/bundles/jammy-bobcat.yaml
View File

@ -1,7 +1,7 @@
local_overlay_enabled: False
options:
source: &source cloud:jammy-zed
source: &source cloud:jammy-bobcat
series: jammy
relations:
- - nova-ironic
@ -281,7 +281,7 @@ services:
openstack-origin: *source
channel: latest/edge
ironic-conductor:
charm: ../../../ironic-conductor_ubuntu-22.04-amd64_ubuntu-22.10-amd64_ubuntu-23.04-amd64.charm
charm: ../../../ironic-conductor_ubuntu-22.04-amd64.charm
num_units: 1
constraints: mem=2G
options:

2
src/tests/bundles/lunar-antelope.yaml
View File

@ -281,7 +281,7 @@ services:
openstack-origin: *source
channel: latest/edge
ironic-conductor:
charm: ../../../ironic-conductor_ubuntu-22.04-amd64_ubuntu-22.10-amd64_ubuntu-23.04-amd64.charm
charm: ../../../ironic-conductor_ubuntu-23.04-amd64.charm
num_units: 1
constraints: mem=2G
options:

305
src/tests/bundles/mantic-bobcat.yaml Normal file
View File

@ -0,0 +1,305 @@
local_overlay_enabled: False
options:
source: &source distro
series: mantic
relations:
- - nova-ironic
- ironic-api
- - ironic-conductor
- ironic-api
- - neutron-ironic-agent:identity-credentials
- keystone
- - neutron-ironic-agent
- neutron-api
- - ironic-api:amqp
- rabbitmq-server:amqp
- - ironic-api
- keystone
- - ironic-api:shared-db
- ironic-api-mysql-router:shared-db
- - ironic-conductor:amqp
- rabbitmq-server:amqp
- - ironic-conductor
- keystone
- - ironic-conductor:shared-db
- ironic-conductor-mysql-router:shared-db
- - nova-ironic:amqp
- rabbitmq-server:amqp
- - nova-ironic
- glance
- - nova-ironic
- keystone
- - nova-ironic
- nova-cloud-controller
- - neutron-gateway:amqp
- rabbitmq-server:amqp
- - keystone:shared-db
- keystone-mysql-router:shared-db
- - nova-cloud-controller:identity-service
- keystone:identity-service
- - glance:identity-service
- keystone:identity-service
- - neutron-api:identity-service
- keystone:identity-service
- - neutron-api:shared-db
- neutron-api-mysql-router:shared-db
- - 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:amqp
- rabbitmq-server:amqp
- - nova-cloud-controller:image-service
- glance:image-service
- - nova-cloud-controller:amqp
- rabbitmq-server:amqp
- - nova-cloud-controller:quantum-network-service
- neutron-gateway:quantum-network-service
- - nova-cloud-controller:shared-db
- nova-cloud-controller-mysql-router:shared-db
- - nova-cloud-controller:neutron-api
- neutron-api:neutron-api
- - cinder:image-service
- glance:image-service
- - cinder:amqp
- rabbitmq-server:amqp
- - cinder:identity-service
- keystone:identity-service
- - cinder:cinder-volume-service
- nova-cloud-controller:cinder-volume-service
- - cinder:shared-db
- cinder-mysql-router:shared-db
- - placement:shared-db
- placement-mysql-router:shared-db
- - placement
- keystone
- - placement
- nova-cloud-controller
- - ceph-mon:client
- nova-ironic:ceph
- - ceph-mon:client
- glance:ceph
- - ceph-radosgw:mon
- ceph-mon:radosgw
- - ceph-radosgw:identity-service
- keystone:identity-service
- - ceph-osd:mon
- ceph-mon:osd
- - ceph-radosgw:object-store
- glance
- - mysql-innodb-cluster:db-router
- nova-cloud-controller-mysql-router:db-router
- - mysql-innodb-cluster:db-router
- keystone-mysql-router:db-router
- - mysql-innodb-cluster:db-router
- glance-mysql-router:db-router
- - mysql-innodb-cluster:db-router
- neutron-api-mysql-router:db-router
- - mysql-innodb-cluster:db-router
- placement-mysql-router:db-router
- - mysql-innodb-cluster:db-router
- cinder-mysql-router:db-router
- - mysql-innodb-cluster:db-router
- ironic-api-mysql-router:db-router
- - mysql-innodb-cluster:db-router
- ironic-conductor-mysql-router:db-router
- - vault-mysql-router:db-router
- mysql-innodb-cluster:db-router
- - vault:shared-db
- vault-mysql-router:shared-db
- - vault:certificates
- ceph-radosgw
- - vault:certificates
- cinder
- - vault:certificates
- glance:certificates
- - vault:certificates
- keystone:certificates
- - vault:certificates
- neutron-api:certificates
- - vault:certificates
- nova-cloud-controller:certificates
- - vault:certificates
- placement:certificates
- - vault
- ironic-conductor
- - vault:certificates
- ironic-api:certificates
- - ironic-api
- hacluster-ironic
services:
nova-cloud-controller-mysql-router:
charm: ch:mysql-router
channel: latest/edge
keystone-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
cinder-mysql-router:
charm: ch:mysql-router
channel: latest/edge
ironic-api-mysql-router:
charm: ch:mysql-router
channel: latest/edge
ironic-conductor-mysql-router:
charm: ch:mysql-router
channel: latest/edge
mysql-innodb-cluster:
charm: ch:mysql-innodb-cluster
num_units: 3
constraints: mem=4G
channel: latest/edge
cinder:
charm: ch:cinder
num_units: 1
constraints: mem=2G
options:
block-device: vdb
glance-api-version: 2
openstack-origin: *source
worker-multiplier: 0.25
storage:
block-devices: cinder,50G
channel: latest/edge
ceph-radosgw:
charm: ch:ceph-radosgw
num_units: 1
constraints: mem=2G
options:
source: *source
namespace-tenants: True
channel: latest/edge
ceph-mon:
charm: ch:ceph-mon
num_units: 3
constraints: mem=2G
options:
expected-osd-count: 3
source: *source
channel: latest/edge
ceph-osd:
charm: ch:ceph-osd
num_units: 3
constraints: mem=2G
options:
source: *source
storage:
osd-devices: 'cinder,30G'
channel: latest/edge
glance:
charm: ch:glance
num_units: 1
constraints: mem=2G
options:
openstack-origin: *source
worker-multiplier: 0.25
channel: latest/edge
keystone:
charm: ch:keystone
num_units: 1
constraints: mem=2G
options:
openstack-origin: *source
worker-multiplier: 0.25
channel: latest/edge
neutron-api:
charm: ch:neutron-api
num_units: 1
constraints: mem=2G
options:
flat-network-providers: "physnet1"
neutron-security-groups: true
openstack-origin: *source
manage-neutron-plugin-legacy-mode: false
worker-multiplier: 0.25
channel: latest/edge
neutron-gateway:
charm: ch:neutron-gateway
num_units: 1
constraints: mem=2G
options:
openstack-origin: *source
enable-isolated-metadata: true
enable-metadata-network: true
bridge-mappings: physnet1:br-ex
channel: latest/edge
nova-cloud-controller:
charm: ch:nova-cloud-controller
num_units: 1
constraints: mem=2G
options:
network-manager: Neutron
openstack-origin: *source
worker-multiplier: 0.25
channel: latest/edge
nova-ironic:
charm: ch:nova-compute
num_units: 1
constraints: mem=2G
options:
enable-live-migration: false
enable-resize: false
openstack-origin: *source
virt-type: ironic
channel: latest/edge
placement:
charm: ch:placement
num_units: 1
constraints: mem=2G
options:
openstack-origin: *source
worker-multiplier: 0.25
channel: latest/edge
rabbitmq-server:
charm: ch:rabbitmq-server
num_units: 1
constraints: mem=2G
channel: latest/edge
hacluster-ironic:
charm: ch:hacluster
num_units: 0
channel: latest/edge
ironic-api:
charm: ch:ironic-api
num_units: 3
constraints: mem=2G
options:
openstack-origin: *source
channel: latest/edge
ironic-conductor:
charm: ../../../ironic-conductor_ubuntu-23.10-amd64.charm
num_units: 1
constraints: mem=2G
options:
openstack-origin: *source
max-tftp-block-size: 1418
disable-secure-erase: true
use-ipxe: true
enabled-network-interfaces: "flat, noop"
hardware-enablement-options: |
[ipmi]
debug = true
neutron-ironic-agent:
charm: ch:neutron-api-plugin-ironic
num_units: 0
options:
openstack-origin: *source
channel: latest/edge
vault:
charm: ch:vault
num_units: 1
channel: latest/edge

8
src/tests/tests.yaml
View File

@ -4,14 +4,15 @@
charm_name: ironic-api
gate_bundles:
- jammy-zed
- jammy-antelope
dev_bundles:
- jammy-antelope
- jammy-bobcat
- lunar-antelope
- mantic-bobcat
smoke_bundles:
- jammy-zed
- jammy-antelope
target_deploy_status:
vault:
@ -39,3 +40,4 @@ tests:
tests_options:
force_deploy:
- lunar-antelope
- mantic-bobcat

6
src/wheelhouse.txt
View File

@ -1,9 +1,3 @@
# Several dependencies now require setuptools-scm>=3.0,<=3.4.1 which requires toml
setuptools-scm>=3.0,<=3.4.1
# Add in Cython for msgpack and setuptools if they need it; for some reason dependency detection in
# charm-build is not picking up the dependency, probably because it is optional, but somehow is
# triggered in LP: #1983388
Cython==0.29.32
toml
keystoneauth1
pbr