Add charmcraft 3 support
Summary of changes: - 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 - Drop non-noble tests - Update constraints file from -2024.1.txt to -noble.txt - Add noble and oracular to charmhelpers - Set env var in tox.ini TEST_JUJU3=1 - Add charmbuild to .zuul.yaml Change-Id: If200e251b667c527a5c1aa9db293b6e0eda4a53d
This commit is contained in:
Myles Penner
parent
422fdadb65
commit
cd5e40d495
@ -2,3 +2,8 @@
|
||||
templates:
|
||||
- openstack-python3-charm-jobs
|
||||
- openstack-cover-jobs
|
||||
check:
|
||||
jobs:
|
||||
- charmbuild
|
||||
vars:
|
||||
charm_build_name: ceilometer-agent
|
||||
|
||||
@ -19,13 +19,17 @@ parts:
|
||||
- metadata.yaml
|
||||
- README.md
|
||||
|
||||
bases:
|
||||
- build-on:
|
||||
- name: ubuntu
|
||||
channel: "22.04"
|
||||
architectures:
|
||||
- amd64
|
||||
run-on:
|
||||
- name: ubuntu
|
||||
channel: "22.04"
|
||||
architectures: [amd64, s390x, ppc64el, arm64]
|
||||
base: ubuntu@24.04
|
||||
platforms:
|
||||
amd64:
|
||||
build-on: amd64
|
||||
build-for: amd64
|
||||
arm64:
|
||||
build-on: arm64
|
||||
build-for: arm64
|
||||
ppc64el:
|
||||
build-on: ppc64el
|
||||
build-for: ppc64el
|
||||
s390x:
|
||||
build-on: s390x
|
||||
build-for: s390x
|
||||
|
||||
@ -33,6 +33,8 @@ UBUNTU_RELEASES = (
|
||||
'kinetic',
|
||||
'lunar',
|
||||
'mantic',
|
||||
'noble',
|
||||
'oracular',
|
||||
)
|
||||
|
||||
|
||||
|
||||
@ -16,8 +16,6 @@ tags:
|
||||
- openstack
|
||||
- telemetry
|
||||
- misc
|
||||
series:
|
||||
- jammy
|
||||
provides:
|
||||
nrpe-external-master:
|
||||
interface: nrpe-external-master
|
||||
|
||||
@ -6,4 +6,4 @@
|
||||
needs_charm_build: true
|
||||
charm_build_name: ceilometer-agent
|
||||
build_type: charmcraft
|
||||
charmcraft_channel: 2.x/stable
|
||||
charmcraft_channel: 3.x/stable
|
||||
|
||||
@ -1,325 +0,0 @@
|
||||
variables:
|
||||
openstack-origin: &openstack-origin cloud:jammy-antelope
|
||||
|
||||
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':
|
||||
# Note that holding memcached at focal as it's not available at jammy yet.
|
||||
series: focal
|
||||
'5':
|
||||
'6':
|
||||
'7':
|
||||
'8':
|
||||
'9':
|
||||
'10':
|
||||
'11':
|
||||
'12':
|
||||
'13':
|
||||
constraints: mem=4096M
|
||||
'14':
|
||||
constraints: mem=4096M cores=4
|
||||
'15':
|
||||
'16':
|
||||
'17':
|
||||
'18':
|
||||
'19':
|
||||
|
||||
applications:
|
||||
|
||||
keystone-mysql-router:
|
||||
charm: ch:mysql-router
|
||||
channel: latest/edge
|
||||
placement-mysql-router:
|
||||
charm: ch:mysql-router
|
||||
channel: latest/edge
|
||||
glance-mysql-router:
|
||||
charm: ch:mysql-router
|
||||
channel: latest/edge
|
||||
nova-cloud-controller-mysql-router:
|
||||
charm: ch:mysql-router
|
||||
channel: latest/edge
|
||||
gnocchi-mysql-router:
|
||||
charm: ch:mysql-router
|
||||
channel: latest/edge
|
||||
neutron-api-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
|
||||
to:
|
||||
- '3'
|
||||
channel: latest/edge
|
||||
|
||||
memcached:
|
||||
charm: ch:memcached
|
||||
num_units: 1
|
||||
# Note that holding memcached at focal as it's not available at jammy yet.
|
||||
series: focal
|
||||
to:
|
||||
- '4'
|
||||
|
||||
ceph-osd:
|
||||
charm: ch:ceph-osd
|
||||
num_units: 3
|
||||
options:
|
||||
source: *openstack-origin
|
||||
storage:
|
||||
osd-devices: 'cinder,10G'
|
||||
to:
|
||||
- '5'
|
||||
- '6'
|
||||
- '7'
|
||||
channel: reef/edge
|
||||
|
||||
ceph-mon:
|
||||
charm: ch:ceph-mon
|
||||
num_units: 3
|
||||
options:
|
||||
source: *openstack-origin
|
||||
to:
|
||||
- '8'
|
||||
- '9'
|
||||
- '10'
|
||||
channel: reef/edge
|
||||
|
||||
keystone:
|
||||
charm: ch:keystone
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
to:
|
||||
- '11'
|
||||
channel: 2024.1/edge
|
||||
|
||||
glance:
|
||||
charm: ch:glance
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
to:
|
||||
- '12'
|
||||
channel: 2024.1/edge
|
||||
|
||||
nova-cloud-controller:
|
||||
charm: ch:nova-cloud-controller
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
network-manager: Neutron
|
||||
to:
|
||||
- '13'
|
||||
channel: 2024.1/edge
|
||||
|
||||
nova-compute:
|
||||
charm: ch:nova-compute
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
to:
|
||||
- '14'
|
||||
channel: 2024.1/edge
|
||||
|
||||
neutron-api:
|
||||
charm: ch:neutron-api
|
||||
num_units: 1
|
||||
options:
|
||||
manage-neutron-plugin-legacy-mode: true
|
||||
openstack-origin: *openstack-origin
|
||||
flat-network-providers: physnet1
|
||||
neutron-security-groups: true
|
||||
to:
|
||||
- '15'
|
||||
channel: 2024.1/edge
|
||||
|
||||
neutron-gateway:
|
||||
charm: ch:neutron-gateway
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
bridge-mappings: physnet1:br-ex
|
||||
to:
|
||||
- '16'
|
||||
channel: 2024.1/edge
|
||||
|
||||
neutron-openvswitch:
|
||||
charm: ch:neutron-openvswitch
|
||||
channel: 2024.1/edge
|
||||
|
||||
ceilometer:
|
||||
charm: ch:ceilometer
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
debug: true
|
||||
polling-interval: 10
|
||||
polling-batch-size: 0
|
||||
to:
|
||||
- '17'
|
||||
channel: 2024.1/edge
|
||||
|
||||
gnocchi:
|
||||
charm: ch:gnocchi
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
to:
|
||||
- '18'
|
||||
channel: 2024.1/edge
|
||||
|
||||
placement:
|
||||
charm: ch:placement
|
||||
num_units: 1
|
||||
constraints: mem=1G
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
to:
|
||||
- '19'
|
||||
channel: 2024.1/edge
|
||||
|
||||
ceilometer-agent:
|
||||
charm: ../../ceilometer-agent.charm
|
||||
options:
|
||||
polling-interval: 10
|
||||
# NOTE(lourot): we normally set this to `true` in other bundles in order
|
||||
# to validate more metrics but this is broken on Wallaby. See lp:1938884
|
||||
enable-all-pollsters: false
|
||||
|
||||
|
||||
relations:
|
||||
|
||||
- - 'ceilometer:amqp'
|
||||
- 'rabbitmq-server:amqp'
|
||||
|
||||
- - 'ceilometer:identity-notifications'
|
||||
- 'keystone:identity-notifications'
|
||||
|
||||
- - 'ceilometer:ceilometer-service'
|
||||
- 'ceilometer-agent:ceilometer-service'
|
||||
|
||||
- - 'ceilometer:metric-service'
|
||||
- 'gnocchi:metric-service'
|
||||
|
||||
- - 'ceilometer:identity-credentials'
|
||||
- 'keystone:identity-credentials'
|
||||
|
||||
- - 'keystone:shared-db'
|
||||
- 'keystone-mysql-router:shared-db'
|
||||
- - 'keystone-mysql-router:db-router'
|
||||
- 'mysql-innodb-cluster:db-router'
|
||||
|
||||
- - 'ceilometer-agent:amqp'
|
||||
- 'rabbitmq-server:amqp'
|
||||
|
||||
- - 'nova-compute:nova-ceilometer'
|
||||
- 'ceilometer-agent:nova-ceilometer'
|
||||
|
||||
- - 'nova-compute:amqp'
|
||||
- 'rabbitmq-server:amqp'
|
||||
|
||||
- - 'placement:shared-db'
|
||||
- 'placement-mysql-router:shared-db'
|
||||
- - 'placement-mysql-router:db-router'
|
||||
- 'mysql-innodb-cluster:db-router'
|
||||
|
||||
- - 'placement:identity-service'
|
||||
- 'keystone:identity-service'
|
||||
|
||||
- - 'placement:placement'
|
||||
- 'nova-cloud-controller:placement'
|
||||
|
||||
- - 'glance:identity-service'
|
||||
- 'keystone:identity-service'
|
||||
|
||||
- - 'glance:shared-db'
|
||||
- 'glance-mysql-router:shared-db'
|
||||
- - 'glance-mysql-router:db-router'
|
||||
- 'mysql-innodb-cluster:db-router'
|
||||
|
||||
- - 'glance:amqp'
|
||||
- 'rabbitmq-server:amqp'
|
||||
|
||||
- - 'nova-compute:image-service'
|
||||
- 'glance:image-service'
|
||||
|
||||
- - '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'
|
||||
|
||||
- - 'ceph-mon:osd'
|
||||
- 'ceph-osd:mon'
|
||||
|
||||
- - 'gnocchi:shared-db'
|
||||
- 'gnocchi-mysql-router:shared-db'
|
||||
- - 'gnocchi-mysql-router:db-router'
|
||||
- 'mysql-innodb-cluster:db-router'
|
||||
|
||||
- - 'gnocchi:storage-ceph'
|
||||
- 'ceph-mon:client'
|
||||
|
||||
- - 'gnocchi:coordinator-memcached'
|
||||
- 'memcached:cache'
|
||||
|
||||
- - 'gnocchi:identity-service'
|
||||
- 'keystone:identity-service'
|
||||
|
||||
- - 'neutron-gateway:amqp'
|
||||
- 'rabbitmq-server:amqp'
|
||||
|
||||
- - 'nova-cloud-controller:quantum-network-service'
|
||||
- 'neutron-gateway:quantum-network-service'
|
||||
|
||||
- - '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:neutron-api'
|
||||
- 'nova-cloud-controller:neutron-api'
|
||||
|
||||
- - 'neutron-api:identity-service'
|
||||
- 'keystone:identity-service'
|
||||
|
||||
- - 'nova-compute:neutron-plugin'
|
||||
- 'neutron-openvswitch:neutron-plugin'
|
||||
|
||||
- - 'rabbitmq-server:amqp'
|
||||
- 'neutron-openvswitch:amqp'
|
||||
@ -1,325 +0,0 @@
|
||||
variables:
|
||||
openstack-origin: &openstack-origin cloud:jammy-bobcat
|
||||
|
||||
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':
|
||||
# Note that holding memcached at focal as it's not available at jammy yet.
|
||||
series: focal
|
||||
'5':
|
||||
'6':
|
||||
'7':
|
||||
'8':
|
||||
'9':
|
||||
'10':
|
||||
'11':
|
||||
'12':
|
||||
'13':
|
||||
constraints: mem=4096M
|
||||
'14':
|
||||
constraints: mem=4096M cores=4
|
||||
'15':
|
||||
'16':
|
||||
'17':
|
||||
'18':
|
||||
'19':
|
||||
|
||||
applications:
|
||||
|
||||
keystone-mysql-router:
|
||||
charm: ch:mysql-router
|
||||
channel: latest/edge
|
||||
placement-mysql-router:
|
||||
charm: ch:mysql-router
|
||||
channel: latest/edge
|
||||
glance-mysql-router:
|
||||
charm: ch:mysql-router
|
||||
channel: latest/edge
|
||||
nova-cloud-controller-mysql-router:
|
||||
charm: ch:mysql-router
|
||||
channel: latest/edge
|
||||
gnocchi-mysql-router:
|
||||
charm: ch:mysql-router
|
||||
channel: latest/edge
|
||||
neutron-api-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
|
||||
to:
|
||||
- '3'
|
||||
channel: latest/edge
|
||||
|
||||
memcached:
|
||||
charm: ch:memcached
|
||||
num_units: 1
|
||||
# Note that holding memcached at focal as it's not available at jammy yet.
|
||||
series: focal
|
||||
to:
|
||||
- '4'
|
||||
|
||||
ceph-osd:
|
||||
charm: ch:ceph-osd
|
||||
num_units: 3
|
||||
options:
|
||||
source: *openstack-origin
|
||||
storage:
|
||||
osd-devices: 'cinder,10G'
|
||||
to:
|
||||
- '5'
|
||||
- '6'
|
||||
- '7'
|
||||
channel: reef/edge
|
||||
|
||||
ceph-mon:
|
||||
charm: ch:ceph-mon
|
||||
num_units: 3
|
||||
options:
|
||||
source: *openstack-origin
|
||||
to:
|
||||
- '8'
|
||||
- '9'
|
||||
- '10'
|
||||
channel: reef/edge
|
||||
|
||||
keystone:
|
||||
charm: ch:keystone
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
to:
|
||||
- '11'
|
||||
channel: 2024.1/edge
|
||||
|
||||
glance:
|
||||
charm: ch:glance
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
to:
|
||||
- '12'
|
||||
channel: 2024.1/edge
|
||||
|
||||
nova-cloud-controller:
|
||||
charm: ch:nova-cloud-controller
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
network-manager: Neutron
|
||||
to:
|
||||
- '13'
|
||||
channel: 2024.1/edge
|
||||
|
||||
nova-compute:
|
||||
charm: ch:nova-compute
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
to:
|
||||
- '14'
|
||||
channel: 2024.1/edge
|
||||
|
||||
neutron-api:
|
||||
charm: ch:neutron-api
|
||||
num_units: 1
|
||||
options:
|
||||
manage-neutron-plugin-legacy-mode: true
|
||||
openstack-origin: *openstack-origin
|
||||
flat-network-providers: physnet1
|
||||
neutron-security-groups: true
|
||||
to:
|
||||
- '15'
|
||||
channel: 2024.1/edge
|
||||
|
||||
neutron-gateway:
|
||||
charm: ch:neutron-gateway
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
bridge-mappings: physnet1:br-ex
|
||||
to:
|
||||
- '16'
|
||||
channel: 2024.1/edge
|
||||
|
||||
neutron-openvswitch:
|
||||
charm: ch:neutron-openvswitch
|
||||
channel: 2024.1/edge
|
||||
|
||||
ceilometer:
|
||||
charm: ch:ceilometer
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
debug: true
|
||||
polling-interval: 10
|
||||
polling-batch-size: 0
|
||||
to:
|
||||
- '17'
|
||||
channel: 2024.1/edge
|
||||
|
||||
gnocchi:
|
||||
charm: ch:gnocchi
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
to:
|
||||
- '18'
|
||||
channel: 2024.1/edge
|
||||
|
||||
placement:
|
||||
charm: ch:placement
|
||||
num_units: 1
|
||||
constraints: mem=1G
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
to:
|
||||
- '19'
|
||||
channel: 2024.1/edge
|
||||
|
||||
ceilometer-agent:
|
||||
charm: ../../ceilometer-agent.charm
|
||||
options:
|
||||
polling-interval: 10
|
||||
# NOTE(lourot): we normally set this to `true` in other bundles in order
|
||||
# to validate more metrics but this is broken on Wallaby. See lp:1938884
|
||||
enable-all-pollsters: false
|
||||
|
||||
|
||||
relations:
|
||||
|
||||
- - 'ceilometer:amqp'
|
||||
- 'rabbitmq-server:amqp'
|
||||
|
||||
- - 'ceilometer:identity-notifications'
|
||||
- 'keystone:identity-notifications'
|
||||
|
||||
- - 'ceilometer:ceilometer-service'
|
||||
- 'ceilometer-agent:ceilometer-service'
|
||||
|
||||
- - 'ceilometer:metric-service'
|
||||
- 'gnocchi:metric-service'
|
||||
|
||||
- - 'ceilometer:identity-credentials'
|
||||
- 'keystone:identity-credentials'
|
||||
|
||||
- - 'keystone:shared-db'
|
||||
- 'keystone-mysql-router:shared-db'
|
||||
- - 'keystone-mysql-router:db-router'
|
||||
- 'mysql-innodb-cluster:db-router'
|
||||
|
||||
- - 'ceilometer-agent:amqp'
|
||||
- 'rabbitmq-server:amqp'
|
||||
|
||||
- - 'nova-compute:nova-ceilometer'
|
||||
- 'ceilometer-agent:nova-ceilometer'
|
||||
|
||||
- - 'nova-compute:amqp'
|
||||
- 'rabbitmq-server:amqp'
|
||||
|
||||
- - 'placement:shared-db'
|
||||
- 'placement-mysql-router:shared-db'
|
||||
- - 'placement-mysql-router:db-router'
|
||||
- 'mysql-innodb-cluster:db-router'
|
||||
|
||||
- - 'placement:identity-service'
|
||||
- 'keystone:identity-service'
|
||||
|
||||
- - 'placement:placement'
|
||||
- 'nova-cloud-controller:placement'
|
||||
|
||||
- - 'glance:identity-service'
|
||||
- 'keystone:identity-service'
|
||||
|
||||
- - 'glance:shared-db'
|
||||
- 'glance-mysql-router:shared-db'
|
||||
- - 'glance-mysql-router:db-router'
|
||||
- 'mysql-innodb-cluster:db-router'
|
||||
|
||||
- - 'glance:amqp'
|
||||
- 'rabbitmq-server:amqp'
|
||||
|
||||
- - 'nova-compute:image-service'
|
||||
- 'glance:image-service'
|
||||
|
||||
- - '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'
|
||||
|
||||
- - 'ceph-mon:osd'
|
||||
- 'ceph-osd:mon'
|
||||
|
||||
- - 'gnocchi:shared-db'
|
||||
- 'gnocchi-mysql-router:shared-db'
|
||||
- - 'gnocchi-mysql-router:db-router'
|
||||
- 'mysql-innodb-cluster:db-router'
|
||||
|
||||
- - 'gnocchi:storage-ceph'
|
||||
- 'ceph-mon:client'
|
||||
|
||||
- - 'gnocchi:coordinator-memcached'
|
||||
- 'memcached:cache'
|
||||
|
||||
- - 'gnocchi:identity-service'
|
||||
- 'keystone:identity-service'
|
||||
|
||||
- - 'neutron-gateway:amqp'
|
||||
- 'rabbitmq-server:amqp'
|
||||
|
||||
- - 'nova-cloud-controller:quantum-network-service'
|
||||
- 'neutron-gateway:quantum-network-service'
|
||||
|
||||
- - '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:neutron-api'
|
||||
- 'nova-cloud-controller:neutron-api'
|
||||
|
||||
- - 'neutron-api:identity-service'
|
||||
- 'keystone:identity-service'
|
||||
|
||||
- - 'nova-compute:neutron-plugin'
|
||||
- 'neutron-openvswitch:neutron-plugin'
|
||||
|
||||
- - 'rabbitmq-server:amqp'
|
||||
- 'neutron-openvswitch:amqp'
|
||||
@ -1,325 +0,0 @@
|
||||
variables:
|
||||
openstack-origin: &openstack-origin cloud:jammy-caracal
|
||||
|
||||
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':
|
||||
# Note that holding memcached at focal as it's not available at jammy yet.
|
||||
series: focal
|
||||
'5':
|
||||
'6':
|
||||
'7':
|
||||
'8':
|
||||
'9':
|
||||
'10':
|
||||
'11':
|
||||
'12':
|
||||
'13':
|
||||
constraints: mem=4096M
|
||||
'14':
|
||||
constraints: mem=4096M cores=4
|
||||
'15':
|
||||
'16':
|
||||
'17':
|
||||
'18':
|
||||
'19':
|
||||
|
||||
applications:
|
||||
|
||||
keystone-mysql-router:
|
||||
charm: ch:mysql-router
|
||||
channel: latest/edge
|
||||
placement-mysql-router:
|
||||
charm: ch:mysql-router
|
||||
channel: latest/edge
|
||||
glance-mysql-router:
|
||||
charm: ch:mysql-router
|
||||
channel: latest/edge
|
||||
nova-cloud-controller-mysql-router:
|
||||
charm: ch:mysql-router
|
||||
channel: latest/edge
|
||||
gnocchi-mysql-router:
|
||||
charm: ch:mysql-router
|
||||
channel: latest/edge
|
||||
neutron-api-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
|
||||
to:
|
||||
- '3'
|
||||
channel: latest/edge
|
||||
|
||||
memcached:
|
||||
charm: ch:memcached
|
||||
num_units: 1
|
||||
# Note that holding memcached at focal as it's not available at jammy yet.
|
||||
series: focal
|
||||
to:
|
||||
- '4'
|
||||
|
||||
ceph-osd:
|
||||
charm: ch:ceph-osd
|
||||
num_units: 3
|
||||
options:
|
||||
source: *openstack-origin
|
||||
storage:
|
||||
osd-devices: 'cinder,10G'
|
||||
to:
|
||||
- '5'
|
||||
- '6'
|
||||
- '7'
|
||||
channel: reef/edge
|
||||
|
||||
ceph-mon:
|
||||
charm: ch:ceph-mon
|
||||
num_units: 3
|
||||
options:
|
||||
source: *openstack-origin
|
||||
to:
|
||||
- '8'
|
||||
- '9'
|
||||
- '10'
|
||||
channel: reef/edge
|
||||
|
||||
keystone:
|
||||
charm: ch:keystone
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
to:
|
||||
- '11'
|
||||
channel: 2024.1/edge
|
||||
|
||||
glance:
|
||||
charm: ch:glance
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
to:
|
||||
- '12'
|
||||
channel: 2024.1/edge
|
||||
|
||||
nova-cloud-controller:
|
||||
charm: ch:nova-cloud-controller
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
network-manager: Neutron
|
||||
to:
|
||||
- '13'
|
||||
channel: 2024.1/edge
|
||||
|
||||
nova-compute:
|
||||
charm: ch:nova-compute
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
to:
|
||||
- '14'
|
||||
channel: 2024.1/edge
|
||||
|
||||
neutron-api:
|
||||
charm: ch:neutron-api
|
||||
num_units: 1
|
||||
options:
|
||||
manage-neutron-plugin-legacy-mode: true
|
||||
openstack-origin: *openstack-origin
|
||||
flat-network-providers: physnet1
|
||||
neutron-security-groups: true
|
||||
to:
|
||||
- '15'
|
||||
channel: 2024.1/edge
|
||||
|
||||
neutron-gateway:
|
||||
charm: ch:neutron-gateway
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
bridge-mappings: physnet1:br-ex
|
||||
to:
|
||||
- '16'
|
||||
channel: 2024.1/edge
|
||||
|
||||
neutron-openvswitch:
|
||||
charm: ch:neutron-openvswitch
|
||||
channel: 2024.1/edge
|
||||
|
||||
ceilometer:
|
||||
charm: ch:ceilometer
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
debug: true
|
||||
polling-interval: 10
|
||||
polling-batch-size: 0
|
||||
to:
|
||||
- '17'
|
||||
channel: 2024.1/edge
|
||||
|
||||
gnocchi:
|
||||
charm: ch:gnocchi
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
to:
|
||||
- '18'
|
||||
channel: 2024.1/edge
|
||||
|
||||
placement:
|
||||
charm: ch:placement
|
||||
num_units: 1
|
||||
constraints: mem=1G
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
to:
|
||||
- '19'
|
||||
channel: 2024.1/edge
|
||||
|
||||
ceilometer-agent:
|
||||
charm: ../../ceilometer-agent.charm
|
||||
options:
|
||||
polling-interval: 10
|
||||
# NOTE(lourot): we normally set this to `true` in other bundles in order
|
||||
# to validate more metrics but this is broken on Wallaby. See lp:1938884
|
||||
enable-all-pollsters: false
|
||||
|
||||
|
||||
relations:
|
||||
|
||||
- - 'ceilometer:amqp'
|
||||
- 'rabbitmq-server:amqp'
|
||||
|
||||
- - 'ceilometer:identity-notifications'
|
||||
- 'keystone:identity-notifications'
|
||||
|
||||
- - 'ceilometer:ceilometer-service'
|
||||
- 'ceilometer-agent:ceilometer-service'
|
||||
|
||||
- - 'ceilometer:metric-service'
|
||||
- 'gnocchi:metric-service'
|
||||
|
||||
- - 'ceilometer:identity-credentials'
|
||||
- 'keystone:identity-credentials'
|
||||
|
||||
- - 'keystone:shared-db'
|
||||
- 'keystone-mysql-router:shared-db'
|
||||
- - 'keystone-mysql-router:db-router'
|
||||
- 'mysql-innodb-cluster:db-router'
|
||||
|
||||
- - 'ceilometer-agent:amqp'
|
||||
- 'rabbitmq-server:amqp'
|
||||
|
||||
- - 'nova-compute:nova-ceilometer'
|
||||
- 'ceilometer-agent:nova-ceilometer'
|
||||
|
||||
- - 'nova-compute:amqp'
|
||||
- 'rabbitmq-server:amqp'
|
||||
|
||||
- - 'placement:shared-db'
|
||||
- 'placement-mysql-router:shared-db'
|
||||
- - 'placement-mysql-router:db-router'
|
||||
- 'mysql-innodb-cluster:db-router'
|
||||
|
||||
- - 'placement:identity-service'
|
||||
- 'keystone:identity-service'
|
||||
|
||||
- - 'placement:placement'
|
||||
- 'nova-cloud-controller:placement'
|
||||
|
||||
- - 'glance:identity-service'
|
||||
- 'keystone:identity-service'
|
||||
|
||||
- - 'glance:shared-db'
|
||||
- 'glance-mysql-router:shared-db'
|
||||
- - 'glance-mysql-router:db-router'
|
||||
- 'mysql-innodb-cluster:db-router'
|
||||
|
||||
- - 'glance:amqp'
|
||||
- 'rabbitmq-server:amqp'
|
||||
|
||||
- - 'nova-compute:image-service'
|
||||
- 'glance:image-service'
|
||||
|
||||
- - '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'
|
||||
|
||||
- - 'ceph-mon:osd'
|
||||
- 'ceph-osd:mon'
|
||||
|
||||
- - 'gnocchi:shared-db'
|
||||
- 'gnocchi-mysql-router:shared-db'
|
||||
- - 'gnocchi-mysql-router:db-router'
|
||||
- 'mysql-innodb-cluster:db-router'
|
||||
|
||||
- - 'gnocchi:storage-ceph'
|
||||
- 'ceph-mon:client'
|
||||
|
||||
- - 'gnocchi:coordinator-memcached'
|
||||
- 'memcached:cache'
|
||||
|
||||
- - 'gnocchi:identity-service'
|
||||
- 'keystone:identity-service'
|
||||
|
||||
- - 'neutron-gateway:amqp'
|
||||
- 'rabbitmq-server:amqp'
|
||||
|
||||
- - 'nova-cloud-controller:quantum-network-service'
|
||||
- 'neutron-gateway:quantum-network-service'
|
||||
|
||||
- - '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:neutron-api'
|
||||
- 'nova-cloud-controller:neutron-api'
|
||||
|
||||
- - 'neutron-api:identity-service'
|
||||
- 'keystone:identity-service'
|
||||
|
||||
- - 'nova-compute:neutron-plugin'
|
||||
- 'neutron-openvswitch:neutron-plugin'
|
||||
|
||||
- - 'rabbitmq-server:amqp'
|
||||
- 'neutron-openvswitch:amqp'
|
||||
@ -14,8 +14,8 @@ machines:
|
||||
constraints: mem=3072M
|
||||
'3':
|
||||
'4':
|
||||
# Note that holding memcached at focal as it's not available at jammy yet.
|
||||
series: focal
|
||||
# Note that holding memcached at jammy as it's not available at noble yet.
|
||||
series: jammy
|
||||
'5':
|
||||
'6':
|
||||
'7':
|
||||
@ -76,8 +76,8 @@ applications:
|
||||
memcached:
|
||||
charm: ch:memcached
|
||||
num_units: 1
|
||||
# Note that holding memcached at focal as it's not available at jammy yet.
|
||||
series: focal
|
||||
# Note that holding memcached at jammy as it's not available at noble yet.
|
||||
series: jammy
|
||||
to:
|
||||
- '4'
|
||||
|
||||
@ -92,7 +92,7 @@ applications:
|
||||
- '5'
|
||||
- '6'
|
||||
- '7'
|
||||
channel: reef/edge
|
||||
channel: latest/edge
|
||||
|
||||
ceph-mon:
|
||||
charm: ch:ceph-mon
|
||||
@ -103,7 +103,7 @@ applications:
|
||||
- '8'
|
||||
- '9'
|
||||
- '10'
|
||||
channel: reef/edge
|
||||
channel: latest/edge
|
||||
|
||||
keystone:
|
||||
charm: ch:keystone
|
||||
@ -112,7 +112,7 @@ applications:
|
||||
openstack-origin: *openstack-origin
|
||||
to:
|
||||
- '11'
|
||||
channel: 2024.1/edge
|
||||
channel: latest/edge
|
||||
|
||||
glance:
|
||||
charm: ch:glance
|
||||
@ -121,7 +121,7 @@ applications:
|
||||
openstack-origin: *openstack-origin
|
||||
to:
|
||||
- '12'
|
||||
channel: 2024.1/edge
|
||||
channel: latest/edge
|
||||
|
||||
nova-cloud-controller:
|
||||
charm: ch:nova-cloud-controller
|
||||
@ -131,7 +131,7 @@ applications:
|
||||
network-manager: Neutron
|
||||
to:
|
||||
- '13'
|
||||
channel: 2024.1/edge
|
||||
channel: latest/edge
|
||||
|
||||
nova-compute:
|
||||
charm: ch:nova-compute
|
||||
@ -140,7 +140,7 @@ applications:
|
||||
openstack-origin: *openstack-origin
|
||||
to:
|
||||
- '14'
|
||||
channel: 2024.1/edge
|
||||
channel: latest/edge
|
||||
|
||||
neutron-api:
|
||||
charm: ch:neutron-api
|
||||
@ -152,7 +152,7 @@ applications:
|
||||
neutron-security-groups: true
|
||||
to:
|
||||
- '15'
|
||||
channel: 2024.1/edge
|
||||
channel: latest/edge
|
||||
|
||||
neutron-gateway:
|
||||
charm: ch:neutron-gateway
|
||||
@ -162,11 +162,11 @@ applications:
|
||||
bridge-mappings: physnet1:br-ex
|
||||
to:
|
||||
- '16'
|
||||
channel: 2024.1/edge
|
||||
channel: latest/edge
|
||||
|
||||
neutron-openvswitch:
|
||||
charm: ch:neutron-openvswitch
|
||||
channel: 2024.1/edge
|
||||
channel: latest/edge
|
||||
|
||||
ceilometer:
|
||||
charm: ch:ceilometer
|
||||
@ -178,7 +178,7 @@ applications:
|
||||
polling-batch-size: 0
|
||||
to:
|
||||
- '17'
|
||||
channel: 2024.1/edge
|
||||
channel: latest/edge
|
||||
|
||||
gnocchi:
|
||||
charm: ch:gnocchi
|
||||
@ -187,7 +187,7 @@ applications:
|
||||
openstack-origin: *openstack-origin
|
||||
to:
|
||||
- '18'
|
||||
channel: 2024.1/edge
|
||||
channel: latest/edge
|
||||
|
||||
placement:
|
||||
charm: ch:placement
|
||||
@ -197,7 +197,7 @@ applications:
|
||||
openstack-origin: *openstack-origin
|
||||
to:
|
||||
- '19'
|
||||
channel: 2024.1/edge
|
||||
channel: latest/edge
|
||||
|
||||
ceilometer-agent:
|
||||
charm: ../../ceilometer-agent.charm
|
||||
|
||||
@ -9,13 +9,11 @@ configure:
|
||||
- zaza.openstack.charm_tests.nova.setup.manage_ssh_key
|
||||
|
||||
gate_bundles:
|
||||
- jammy-antelope
|
||||
- jammy-bobcat
|
||||
- jammy-caracal
|
||||
- noble-caracal
|
||||
dev_bundles:
|
||||
- noble-caracal
|
||||
smoke_bundles:
|
||||
- jammy-caracal
|
||||
- noble-caracal
|
||||
tests:
|
||||
- zaza.openstack.charm_tests.ceilometer.tests.CeilometerTest
|
||||
- zaza.openstack.charm_tests.ceilometer_agent.tests.CeilometerAgentTest
|
||||
|
||||
11
tox.ini
11
tox.ini
@ -22,6 +22,7 @@ skip_install = True
|
||||
setenv = VIRTUAL_ENV={envdir}
|
||||
PYTHONHASHSEED=0
|
||||
CHARM_DIR={envdir}
|
||||
TEST_JUJU3=1 # Note(mylesjp): Force Juju 3
|
||||
commands = stestr run --slowest {posargs}
|
||||
allowlist_externals =
|
||||
charmcraft
|
||||
@ -33,7 +34,7 @@ passenv =
|
||||
OS_*
|
||||
TEST_*
|
||||
deps =
|
||||
-c {env:TEST_CONSTRAINTS_FILE:https://raw.githubusercontent.com/openstack-charmers/zaza-openstack-tests/master/constraints/constraints-2024.1.txt}
|
||||
-c {env:TEST_CONSTRAINTS_FILE:https://raw.githubusercontent.com/openstack-charmers/zaza-openstack-tests/master/constraints/constraints-noble.txt}
|
||||
-r{toxinidir}/test-requirements.txt
|
||||
|
||||
[testenv:build]
|
||||
@ -52,21 +53,21 @@ commands =
|
||||
[testenv:py310]
|
||||
basepython = python3.10
|
||||
deps =
|
||||
-c {env:TEST_CONSTRAINTS_FILE:https://raw.githubusercontent.com/openstack-charmers/zaza-openstack-tests/master/constraints/constraints-2024.1.txt}
|
||||
-c {env:TEST_CONSTRAINTS_FILE:https://raw.githubusercontent.com/openstack-charmers/zaza-openstack-tests/master/constraints/constraints-noble.txt}
|
||||
-r{toxinidir}/requirements.txt
|
||||
-r{toxinidir}/test-requirements.txt
|
||||
|
||||
[testenv:py312]
|
||||
basepython = python3.12
|
||||
deps =
|
||||
-c {env:TEST_CONSTRAINTS_FILE:https://raw.githubusercontent.com/openstack-charmers/zaza-openstack-tests/master/constraints/constraints-2024.1.txt}
|
||||
-c {env:TEST_CONSTRAINTS_FILE:https://raw.githubusercontent.com/openstack-charmers/zaza-openstack-tests/master/constraints/constraints-noble.txt}
|
||||
-r{toxinidir}/requirements.txt
|
||||
-r{toxinidir}/test-requirements.txt
|
||||
|
||||
[testenv:py3]
|
||||
basepython = python3
|
||||
deps =
|
||||
-c {env:TEST_CONSTRAINTS_FILE:https://raw.githubusercontent.com/openstack-charmers/zaza-openstack-tests/master/constraints/constraints-2024.1.txt}
|
||||
-c {env:TEST_CONSTRAINTS_FILE:https://raw.githubusercontent.com/openstack-charmers/zaza-openstack-tests/master/constraints/constraints-noble.txt}
|
||||
-r{toxinidir}/requirements.txt
|
||||
-r{toxinidir}/test-requirements.txt
|
||||
|
||||
@ -82,7 +83,7 @@ commands = flake8 {posargs} hooks unit_tests tests actions lib files
|
||||
# https://github.com/openstack/nova/blob/master/tox.ini
|
||||
basepython = python3
|
||||
deps =
|
||||
-c {env:TEST_CONSTRAINTS_FILE:https://raw.githubusercontent.com/openstack-charmers/zaza-openstack-tests/master/constraints/constraints-2024.1.txt}
|
||||
-c {env:TEST_CONSTRAINTS_FILE:https://raw.githubusercontent.com/openstack-charmers/zaza-openstack-tests/master/constraints/constraints-noble.txt}
|
||||
-r{toxinidir}/requirements.txt
|
||||
-r{toxinidir}/test-requirements.txt
|
||||
setenv =
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user