openstack
/
charm-ironic-conductor
Code Issues Proposed changes

Updates for caracal testing support 

These updates, on the master branch, are to support testing the caracal
packages and support of the charms for caracal.  They do NOT lock the charms
down, and don't change the testing branches to stable branches.

Change-Id: I927a409375057e96c45c254ba99f0cbc61b63f0b
This commit is contained in:
Alex Kavanagh 2024-02-09 18:15:47 +00:00
parent 1ceb18ce1a
commit 5701bb7aa5
8 changed files with 75 additions and 145 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
charmcraft.yaml
View File

@ -54,67 +54,3 @@ bases:
- 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: "23.04"
architectures: [s390x]
run-on:
- name: ubuntu
channel: "23.04"
architectures: [s390x]
- build-on:
- name: ubuntu
channel: "23.04"
architectures: [ppc64el]
run-on:
- name: ubuntu
channel: "23.04"
architectures: [ppc64el]
- build-on:
- name: ubuntu
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: "23.10"
architectures: [s390x]
- build-on:
- name: ubuntu
channel: "23.10"
architectures: [ppc64el]
run-on:
- name: ubuntu
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.x/edge
charmcraft_channel: 2.x/stable

8
src/metadata.yaml
View File

@ -10,12 +10,10 @@ description: |
to provision and turn on/off machines, but Ironic also supports
vendor-specific plugins which may implement additional functionality.
tags:
- openstack
- baremetal
- openstack
- baremetal
series:
- jammy
- lunar
- mantic
- jammy
extra-bindings:
deployment:
cleaning:

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

@ -174,7 +174,7 @@ services:
worker-multiplier: 0.25
storage:
block-devices: cinder,50G
channel: latest/edge
channel: 2024.1/edge
ceph-radosgw:
charm: ch:ceph-radosgw
num_units: 1
@ -182,7 +182,7 @@ services:
options:
source: *source
namespace-tenants: True
channel: latest/edge
channel: reef/edge
ceph-mon:
charm: ch:ceph-mon
num_units: 3
@ -190,7 +190,7 @@ services:
options:
expected-osd-count: 3
source: *source
channel: latest/edge
channel: reef/edge
ceph-osd:
charm: ch:ceph-osd
num_units: 3
@ -199,7 +199,7 @@ services:
source: *source
storage:
osd-devices: 'cinder,30G'
channel: latest/edge
channel: reef/edge
glance:
charm: ch:glance
num_units: 1
@ -207,7 +207,7 @@ services:
options:
openstack-origin: *source
worker-multiplier: 0.25
channel: latest/edge
channel: 2024.1/edge
keystone:
charm: ch:keystone
num_units: 1
@ -215,7 +215,7 @@ services:
options:
openstack-origin: *source
worker-multiplier: 0.25
channel: latest/edge
channel: 2024.1/edge
neutron-api:
charm: ch:neutron-api
num_units: 1
@ -226,7 +226,7 @@ services:
openstack-origin: *source
manage-neutron-plugin-legacy-mode: false
worker-multiplier: 0.25
channel: latest/edge
channel: 2024.1/edge
neutron-gateway:
charm: ch:neutron-gateway
num_units: 1
@ -236,7 +236,7 @@ services:
enable-isolated-metadata: true
enable-metadata-network: true
bridge-mappings: physnet1:br-ex
channel: latest/edge
channel: 2024.1/edge
nova-cloud-controller:
charm: ch:nova-cloud-controller
num_units: 1
@ -245,7 +245,7 @@ services:
network-manager: Neutron
openstack-origin: *source
worker-multiplier: 0.25
channel: latest/edge
channel: 2024.1/edge
nova-ironic:
charm: ch:nova-compute
num_units: 1
@ -255,7 +255,7 @@ services:
enable-resize: false
openstack-origin: *source
virt-type: ironic
channel: latest/edge
channel: 2024.1/edge
placement:
charm: ch:placement
num_units: 1
@ -263,7 +263,7 @@ services:
options:
openstack-origin: *source
worker-multiplier: 0.25
channel: latest/edge
channel: 2024.1/edge
rabbitmq-server:
charm: ch:rabbitmq-server
num_units: 1
@ -279,7 +279,7 @@ services:
constraints: mem=2G
options:
openstack-origin: *source
channel: latest/edge
channel: 2024.1/edge
ironic-conductor:
charm: ../../../ironic-conductor_ubuntu-22.04-amd64.charm
num_units: 1
@ -298,7 +298,7 @@ services:
num_units: 0
options:
openstack-origin: *source
channel: latest/edge
channel: 2024.1/edge
vault:
charm: ch:vault
num_units: 1

26
src/tests/bundles/jammy-bobcat.yaml
View File

@ -174,7 +174,7 @@ services:
worker-multiplier: 0.25
storage:
block-devices: cinder,50G
channel: latest/edge
channel: 2024.1/edge
ceph-radosgw:
charm: ch:ceph-radosgw
num_units: 1
@ -182,7 +182,7 @@ services:
options:
source: *source
namespace-tenants: True
channel: latest/edge
channel: reef/edge
ceph-mon:
charm: ch:ceph-mon
num_units: 3
@ -190,7 +190,7 @@ services:
options:
expected-osd-count: 3
source: *source
channel: latest/edge
channel: reef/edge
ceph-osd:
charm: ch:ceph-osd
num_units: 3
@ -199,7 +199,7 @@ services:
source: *source
storage:
osd-devices: 'cinder,30G'
channel: latest/edge
channel: reef/edge
glance:
charm: ch:glance
num_units: 1
@ -207,7 +207,7 @@ services:
options:
openstack-origin: *source
worker-multiplier: 0.25
channel: latest/edge
channel: 2024.1/edge
keystone:
charm: ch:keystone
num_units: 1
@ -215,7 +215,7 @@ services:
options:
openstack-origin: *source
worker-multiplier: 0.25
channel: latest/edge
channel: 2024.1/edge
neutron-api:
charm: ch:neutron-api
num_units: 1
@ -226,7 +226,7 @@ services:
openstack-origin: *source
manage-neutron-plugin-legacy-mode: false
worker-multiplier: 0.25
channel: latest/edge
channel: 2024.1/edge
neutron-gateway:
charm: ch:neutron-gateway
num_units: 1
@ -236,7 +236,7 @@ services:
enable-isolated-metadata: true
enable-metadata-network: true
bridge-mappings: physnet1:br-ex
channel: latest/edge
channel: 2024.1/edge
nova-cloud-controller:
charm: ch:nova-cloud-controller
num_units: 1
@ -245,7 +245,7 @@ services:
network-manager: Neutron
openstack-origin: *source
worker-multiplier: 0.25
channel: latest/edge
channel: 2024.1/edge
nova-ironic:
charm: ch:nova-compute
num_units: 1
@ -255,7 +255,7 @@ services:
enable-resize: false
openstack-origin: *source
virt-type: ironic
channel: latest/edge
channel: 2024.1/edge
placement:
charm: ch:placement
num_units: 1
@ -263,7 +263,7 @@ services:
options:
openstack-origin: *source
worker-multiplier: 0.25
channel: latest/edge
channel: 2024.1/edge
rabbitmq-server:
charm: ch:rabbitmq-server
num_units: 1
@ -279,7 +279,7 @@ services:
constraints: mem=2G
options:
openstack-origin: *source
channel: latest/edge
channel: 2024.1/edge
ironic-conductor:
charm: ../../../ironic-conductor_ubuntu-22.04-amd64.charm
num_units: 1
@ -298,7 +298,7 @@ services:
num_units: 0
options:
openstack-origin: *source
channel: latest/edge
channel: 2024.1/edge
vault:
charm: ch:vault
num_units: 1

32
src/tests/bundles/mantic-bobcat.yaml → src/tests/bundles/jammy-caracal.yaml
View File

@ -1,8 +1,8 @@
local_overlay_enabled: False
options:
source: &source distro
series: mantic
source: &source cloud:jammy-caracal
series: jammy
relations:
- - nova-ironic
- ironic-api
@ -174,7 +174,7 @@ services:
worker-multiplier: 0.25
storage:
block-devices: cinder,50G
channel: latest/edge
channel: 2024.1/edge
ceph-radosgw:
charm: ch:ceph-radosgw
num_units: 1
@ -182,7 +182,7 @@ services:
options:
source: *source
namespace-tenants: True
channel: latest/edge
channel: reef/edge
ceph-mon:
charm: ch:ceph-mon
num_units: 3
@ -190,7 +190,7 @@ services:
options:
expected-osd-count: 3
source: *source
channel: latest/edge
channel: reef/edge
ceph-osd:
charm: ch:ceph-osd
num_units: 3
@ -199,7 +199,7 @@ services:
source: *source
storage:
osd-devices: 'cinder,30G'
channel: latest/edge
channel: reef/edge
glance:
charm: ch:glance
num_units: 1
@ -207,7 +207,7 @@ services:
options:
openstack-origin: *source
worker-multiplier: 0.25
channel: latest/edge
channel: 2024.1/edge
keystone:
charm: ch:keystone
num_units: 1
@ -215,7 +215,7 @@ services:
options:
openstack-origin: *source
worker-multiplier: 0.25
channel: latest/edge
channel: 2024.1/edge
neutron-api:
charm: ch:neutron-api
num_units: 1
@ -226,7 +226,7 @@ services:
openstack-origin: *source
manage-neutron-plugin-legacy-mode: false
worker-multiplier: 0.25
channel: latest/edge
channel: 2024.1/edge
neutron-gateway:
charm: ch:neutron-gateway
num_units: 1
@ -236,7 +236,7 @@ services:
enable-isolated-metadata: true
enable-metadata-network: true
bridge-mappings: physnet1:br-ex
channel: latest/edge
channel: 2024.1/edge
nova-cloud-controller:
charm: ch:nova-cloud-controller
num_units: 1
@ -245,7 +245,7 @@ services:
network-manager: Neutron
openstack-origin: *source
worker-multiplier: 0.25
channel: latest/edge
channel: 2024.1/edge
nova-ironic:
charm: ch:nova-compute
num_units: 1
@ -255,7 +255,7 @@ services:
enable-resize: false
openstack-origin: *source
virt-type: ironic
channel: latest/edge
channel: 2024.1/edge
placement:
charm: ch:placement
num_units: 1
@ -263,7 +263,7 @@ services:
options:
openstack-origin: *source
worker-multiplier: 0.25
channel: latest/edge
channel: 2024.1/edge
rabbitmq-server:
charm: ch:rabbitmq-server
num_units: 1
@ -279,9 +279,9 @@ services:
constraints: mem=2G
options:
openstack-origin: *source
channel: latest/edge
channel: 2024.1/edge
ironic-conductor:
charm: ../../../ironic-conductor_ubuntu-23.10-amd64.charm
charm: ../../../ironic-conductor_ubuntu-22.04-amd64.charm
num_units: 1
constraints: mem=2G
options:
@ -298,7 +298,7 @@ services:
num_units: 0
options:
openstack-origin: *source
channel: latest/edge
channel: 2024.1/edge
vault:
charm: ch:vault
num_units: 1

30
src/tests/bundles/lunar-antelope.yaml → src/tests/bundles/nobel-caracal.yaml
View File

@ -2,7 +2,7 @@ local_overlay_enabled: False
options:
source: &source distro
series: lunar
series: nobel
relations:
- - nova-ironic
- ironic-api
@ -174,7 +174,7 @@ services:
worker-multiplier: 0.25
storage:
block-devices: cinder,50G
channel: latest/edge
channel: 2024.1/edge
ceph-radosgw:
charm: ch:ceph-radosgw
num_units: 1
@ -182,7 +182,7 @@ services:
options:
source: *source
namespace-tenants: True
channel: latest/edge
channel: reef/edge
ceph-mon:
charm: ch:ceph-mon
num_units: 3
@ -190,7 +190,7 @@ services:
options:
expected-osd-count: 3
source: *source
channel: latest/edge
channel: reef/edge
ceph-osd:
charm: ch:ceph-osd
num_units: 3
@ -199,7 +199,7 @@ services:
source: *source
storage:
osd-devices: 'cinder,30G'
channel: latest/edge
channel: reef/edge
glance:
charm: ch:glance
num_units: 1
@ -207,7 +207,7 @@ services:
options:
openstack-origin: *source
worker-multiplier: 0.25
channel: latest/edge
channel: 2024.1/edge
keystone:
charm: ch:keystone
num_units: 1
@ -215,7 +215,7 @@ services:
options:
openstack-origin: *source
worker-multiplier: 0.25
channel: latest/edge
channel: 2024.1/edge
neutron-api:
charm: ch:neutron-api
num_units: 1
@ -226,7 +226,7 @@ services:
openstack-origin: *source
manage-neutron-plugin-legacy-mode: false
worker-multiplier: 0.25
channel: latest/edge
channel: 2024.1/edge
neutron-gateway:
charm: ch:neutron-gateway
num_units: 1
@ -236,7 +236,7 @@ services:
enable-isolated-metadata: true
enable-metadata-network: true
bridge-mappings: physnet1:br-ex
channel: latest/edge
channel: 2024.1/edge
nova-cloud-controller:
charm: ch:nova-cloud-controller
num_units: 1
@ -245,7 +245,7 @@ services:
network-manager: Neutron
openstack-origin: *source
worker-multiplier: 0.25
channel: latest/edge
channel: 2024.1/edge
nova-ironic:
charm: ch:nova-compute
num_units: 1
@ -255,7 +255,7 @@ services:
enable-resize: false
openstack-origin: *source
virt-type: ironic
channel: latest/edge
channel: 2024.1/edge
placement:
charm: ch:placement
num_units: 1
@ -263,7 +263,7 @@ services:
options:
openstack-origin: *source
worker-multiplier: 0.25
channel: latest/edge
channel: 2024.1/edge
rabbitmq-server:
charm: ch:rabbitmq-server
num_units: 1
@ -279,9 +279,9 @@ services:
constraints: mem=2G
options:
openstack-origin: *source
channel: latest/edge
channel: 2024.1/edge
ironic-conductor:
charm: ../../../ironic-conductor_ubuntu-23.04-amd64.charm
charm: ../../../ironic-conductor_ubuntu-22.04-amd64.charm
num_units: 1
constraints: mem=2G
options:
@ -298,7 +298,7 @@ services:
num_units: 0
options:
openstack-origin: *source
channel: latest/edge
channel: 2024.1/edge
vault:
charm: ch:vault
num_units: 1

32
src/tests/tests.yaml
View File

@ -4,16 +4,13 @@
charm_name: ironic-api
gate_bundles:
- jammy-antelope
dev_bundles:
- jammy-bobcat
- lunar-antelope
- mantic-bobcat
smoke_bundles:
- jammy-antelope
- jammy-bobcat
- jammy-caracal
dev_bundles:
- nobel-caracal
smoke_bundles:
- jammy-caracal
target_deploy_status:
vault:
workload-status: blocked
@ -23,21 +20,20 @@ target_deploy_status:
workload-status-message-prefix: invalid enabled-deploy-interfaces config
configure:
- zaza.openstack.charm_tests.vault.setup.auto_initialize
- zaza.openstack.charm_tests.ironic.setup.set_temp_url_secret
- zaza.openstack.charm_tests.ironic.setup.add_ironic_deployment_image
- zaza.openstack.charm_tests.ironic.setup.add_ironic_os_image
- zaza.openstack.charm_tests.ironic.setup.create_bm_flavors
- zaza.openstack.charm_tests.vault.setup.auto_initialize
- zaza.openstack.charm_tests.ironic.setup.set_temp_url_secret
- zaza.openstack.charm_tests.ironic.setup.add_ironic_deployment_image
- zaza.openstack.charm_tests.ironic.setup.add_ironic_os_image
- zaza.openstack.charm_tests.ironic.setup.create_bm_flavors
# Ironic will require a flat network to test the flat network type. Once a proper
# testing environment will be available for Ironic, we will need to add the setup
# call to create that flat network
#- zaza.openstack.charm_tests.neutron.setup.basic_overcloud_network
- zaza.openstack.charm_tests.nova.setup.manage_ssh_key
- zaza.openstack.charm_tests.nova.setup.manage_ssh_key
tests:
- zaza.openstack.charm_tests.ironic.tests.IronicTest
- zaza.openstack.charm_tests.ironic.tests.IronicTest
tests_options:
force_deploy:
- lunar-antelope
- mantic-bobcat
- nobel-caracal