Add Antelope support
* sync charm-helpers to classic charms * change openstack-origin/source default to antelope * align testing with antelope * add new antelope bundles * add antelope bundles to tests.yaml * add antelope tests to osci.yaml and .zuul.yaml * update build-on and run-on bases Change-Id: Ic8c57d74f26b788a923d08eb3b88882dfc142bf7
This commit is contained in:
parent
eb6437174a
commit
108f38724f
|
@ -1,4 +1,4 @@
|
||||||
- project:
|
- project:
|
||||||
templates:
|
templates:
|
||||||
- openstack-python3-charm-zed-jobs
|
- openstack-python3-charm-jobs
|
||||||
- openstack-cover-jobs
|
- openstack-cover-jobs
|
||||||
|
|
|
@ -31,6 +31,9 @@ bases:
|
||||||
- name: ubuntu
|
- name: ubuntu
|
||||||
channel: "22.10"
|
channel: "22.10"
|
||||||
architectures: [amd64]
|
architectures: [amd64]
|
||||||
|
- name: ubuntu
|
||||||
|
channel: "23.04"
|
||||||
|
architectures: [amd64]
|
||||||
- build-on:
|
- build-on:
|
||||||
- name: ubuntu
|
- name: ubuntu
|
||||||
channel: "22.04"
|
channel: "22.04"
|
||||||
|
@ -42,6 +45,9 @@ bases:
|
||||||
- name: ubuntu
|
- name: ubuntu
|
||||||
channel: "22.10"
|
channel: "22.10"
|
||||||
architectures: [arm64]
|
architectures: [arm64]
|
||||||
|
- name: ubuntu
|
||||||
|
channel: "23.04"
|
||||||
|
architectures: [arm64]
|
||||||
- build-on:
|
- build-on:
|
||||||
- name: ubuntu
|
- name: ubuntu
|
||||||
channel: "22.04"
|
channel: "22.04"
|
||||||
|
@ -53,6 +59,9 @@ bases:
|
||||||
- name: ubuntu
|
- name: ubuntu
|
||||||
channel: "22.10"
|
channel: "22.10"
|
||||||
architectures: [ppc64el]
|
architectures: [ppc64el]
|
||||||
|
- name: ubuntu
|
||||||
|
channel: "23.04"
|
||||||
|
architectures: [ppc64el]
|
||||||
- build-on:
|
- build-on:
|
||||||
- name: ubuntu
|
- name: ubuntu
|
||||||
channel: "22.04"
|
channel: "22.04"
|
||||||
|
@ -64,3 +73,6 @@ bases:
|
||||||
- name: ubuntu
|
- name: ubuntu
|
||||||
channel: "22.10"
|
channel: "22.10"
|
||||||
architectures: [s390x]
|
architectures: [s390x]
|
||||||
|
- name: ubuntu
|
||||||
|
channel: "23.04"
|
||||||
|
architectures: [s390x]
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
- project:
|
- project:
|
||||||
templates:
|
templates:
|
||||||
- charm-unit-jobs-py310
|
- charm-unit-jobs-py310
|
||||||
- charm-zed-functional-jobs
|
- charm-functional-jobs
|
||||||
vars:
|
vars:
|
||||||
needs_charm_build: true
|
needs_charm_build: true
|
||||||
charm_build_name: manila
|
charm_build_name: manila
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
options:
|
options:
|
||||||
openstack-origin:
|
openstack-origin:
|
||||||
default: zed
|
default: antelope
|
||||||
type: string
|
type: string
|
||||||
description: |
|
description: |
|
||||||
Repository from which to install. May be one of the following:
|
Repository from which to install. May be one of the following:
|
||||||
|
|
|
@ -13,6 +13,7 @@ tags:
|
||||||
series:
|
series:
|
||||||
- jammy
|
- jammy
|
||||||
- kinetic
|
- kinetic
|
||||||
|
- lunar
|
||||||
subordinate: false
|
subordinate: false
|
||||||
requires:
|
requires:
|
||||||
shared-db:
|
shared-db:
|
||||||
|
|
|
@ -0,0 +1,341 @@
|
||||||
|
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':
|
||||||
|
'12':
|
||||||
|
'13':
|
||||||
|
'14':
|
||||||
|
'15':
|
||||||
|
# 16 and 17 are nova compute units
|
||||||
|
'16':
|
||||||
|
constraints: mem=8G
|
||||||
|
'17':
|
||||||
|
constraints: mem=8G
|
||||||
|
'18':
|
||||||
|
'19':
|
||||||
|
'20':
|
||||||
|
'21':
|
||||||
|
'22':
|
||||||
|
'23':
|
||||||
|
|
||||||
|
services:
|
||||||
|
|
||||||
|
manila-mysql-router:
|
||||||
|
charm: ch:mysql-router
|
||||||
|
channel: latest/edge
|
||||||
|
manila-ganesha-mysql-router:
|
||||||
|
charm: ch:mysql-router
|
||||||
|
channel: latest/edge
|
||||||
|
keystone-mysql-router:
|
||||||
|
charm: ch:mysql-router
|
||||||
|
channel: latest/edge
|
||||||
|
neutron-api-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
|
||||||
|
placement-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
|
||||||
|
|
||||||
|
manila-ganesha:
|
||||||
|
num_units: 1
|
||||||
|
charm: ch:manila-ganesha
|
||||||
|
options:
|
||||||
|
openstack-origin: *openstack-origin
|
||||||
|
to:
|
||||||
|
- '3'
|
||||||
|
channel: latest/edge
|
||||||
|
|
||||||
|
ceph-mon:
|
||||||
|
charm: ch:ceph-mon
|
||||||
|
num_units: 3
|
||||||
|
options:
|
||||||
|
source: *openstack-origin
|
||||||
|
to:
|
||||||
|
- '4'
|
||||||
|
- '5'
|
||||||
|
- '6'
|
||||||
|
channel: latest/edge
|
||||||
|
|
||||||
|
ceph-osd:
|
||||||
|
charm: ch:ceph-osd
|
||||||
|
num_units: 3
|
||||||
|
options:
|
||||||
|
source: *openstack-origin
|
||||||
|
storage:
|
||||||
|
osd-devices: 'cinder,10G'
|
||||||
|
to:
|
||||||
|
- '7'
|
||||||
|
- '8'
|
||||||
|
- '9'
|
||||||
|
channel: latest/edge
|
||||||
|
|
||||||
|
ceph-fs:
|
||||||
|
charm: ch:ceph-fs
|
||||||
|
num_units: 2
|
||||||
|
options:
|
||||||
|
source: *openstack-origin
|
||||||
|
to:
|
||||||
|
- '10'
|
||||||
|
- '11'
|
||||||
|
channel: latest/edge
|
||||||
|
|
||||||
|
manila:
|
||||||
|
charm: ../../../manila_ubuntu-22.04-amd64_ubuntu-22.10-amd64_ubuntu-23.04-amd64.charm
|
||||||
|
num_units: 3
|
||||||
|
options:
|
||||||
|
default-share-backend: cephfsnfs1
|
||||||
|
share-protocols: NFS
|
||||||
|
openstack-origin: *openstack-origin
|
||||||
|
to:
|
||||||
|
- '12'
|
||||||
|
- '13'
|
||||||
|
- '14'
|
||||||
|
|
||||||
|
nova-cloud-controller:
|
||||||
|
charm: ch:nova-cloud-controller
|
||||||
|
num_units: 1
|
||||||
|
options:
|
||||||
|
network-manager: Neutron
|
||||||
|
openstack-origin: *openstack-origin
|
||||||
|
to:
|
||||||
|
- '15'
|
||||||
|
channel: latest/edge
|
||||||
|
|
||||||
|
nova-compute:
|
||||||
|
charm: ch:nova-compute
|
||||||
|
num_units: 2
|
||||||
|
storage:
|
||||||
|
ephemeral-device: '40G'
|
||||||
|
options:
|
||||||
|
config-flags: default_ephemeral_format=ext4
|
||||||
|
enable-live-migration: true
|
||||||
|
enable-resize: true
|
||||||
|
migration-auth-type: ssh
|
||||||
|
openstack-origin: *openstack-origin
|
||||||
|
to:
|
||||||
|
- '16'
|
||||||
|
- '17'
|
||||||
|
channel: latest/edge
|
||||||
|
|
||||||
|
glance:
|
||||||
|
charm: ch:glance
|
||||||
|
num_units: 1
|
||||||
|
options:
|
||||||
|
openstack-origin: *openstack-origin
|
||||||
|
to:
|
||||||
|
- '18'
|
||||||
|
channel: latest/edge
|
||||||
|
|
||||||
|
neutron-api:
|
||||||
|
charm: ch:neutron-api
|
||||||
|
num_units: 1
|
||||||
|
options:
|
||||||
|
manage-neutron-plugin-legacy-mode: true
|
||||||
|
neutron-plugin: ovs
|
||||||
|
flat-network-providers: physnet1
|
||||||
|
neutron-security-groups: true
|
||||||
|
openstack-origin: *openstack-origin
|
||||||
|
to:
|
||||||
|
- '19'
|
||||||
|
channel: latest/edge
|
||||||
|
|
||||||
|
neutron-openvswitch:
|
||||||
|
charm: ch:neutron-openvswitch
|
||||||
|
channel: latest/edge
|
||||||
|
|
||||||
|
neutron-gateway:
|
||||||
|
charm: ch:neutron-gateway
|
||||||
|
num_units: 1
|
||||||
|
options:
|
||||||
|
bridge-mappings: physnet1:br-ex
|
||||||
|
openstack-origin: *openstack-origin
|
||||||
|
to:
|
||||||
|
- '20'
|
||||||
|
channel: latest/edge
|
||||||
|
|
||||||
|
keystone:
|
||||||
|
charm: ch:keystone
|
||||||
|
num_units: 1
|
||||||
|
options:
|
||||||
|
openstack-origin: *openstack-origin
|
||||||
|
to:
|
||||||
|
- '21'
|
||||||
|
channel: latest/edge
|
||||||
|
|
||||||
|
rabbitmq-server:
|
||||||
|
charm: ch:rabbitmq-server
|
||||||
|
num_units: 1
|
||||||
|
to:
|
||||||
|
- '22'
|
||||||
|
channel: latest/edge
|
||||||
|
|
||||||
|
placement:
|
||||||
|
charm: ch:placement
|
||||||
|
num_units: 1
|
||||||
|
options:
|
||||||
|
openstack-origin: *openstack-origin
|
||||||
|
to:
|
||||||
|
- '23'
|
||||||
|
channel: latest/edge
|
||||||
|
|
||||||
|
nrpe:
|
||||||
|
charm: ch:nrpe
|
||||||
|
channel: latest/edge
|
||||||
|
|
||||||
|
relations:
|
||||||
|
- - 'ceph-mon'
|
||||||
|
- 'ceph-osd'
|
||||||
|
|
||||||
|
- - 'ceph-mon'
|
||||||
|
- 'ceph-fs'
|
||||||
|
|
||||||
|
- - 'ceph-mon'
|
||||||
|
- 'manila-ganesha'
|
||||||
|
|
||||||
|
- - 'manila:shared-db'
|
||||||
|
- 'manila-mysql-router:shared-db'
|
||||||
|
- - 'manila-mysql-router:db-router'
|
||||||
|
- 'mysql-innodb-cluster:db-router'
|
||||||
|
|
||||||
|
- - 'manila-ganesha'
|
||||||
|
- 'rabbitmq-server'
|
||||||
|
|
||||||
|
- - 'manila-ganesha'
|
||||||
|
- 'keystone'
|
||||||
|
|
||||||
|
- - 'manila'
|
||||||
|
- 'manila-ganesha'
|
||||||
|
|
||||||
|
- - 'manila-ganesha:shared-db'
|
||||||
|
- 'manila-ganesha-mysql-router:shared-db'
|
||||||
|
- - 'manila-ganesha-mysql-router:db-router'
|
||||||
|
- 'mysql-innodb-cluster:db-router'
|
||||||
|
|
||||||
|
- - 'manila'
|
||||||
|
- 'rabbitmq-server'
|
||||||
|
|
||||||
|
- - 'manila'
|
||||||
|
- 'keystone'
|
||||||
|
|
||||||
|
- - 'keystone:shared-db'
|
||||||
|
- 'keystone-mysql-router:shared-db'
|
||||||
|
- - 'keystone-mysql-router:db-router'
|
||||||
|
- 'mysql-innodb-cluster:db-router'
|
||||||
|
|
||||||
|
- - '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:neutron-plugin-api'
|
||||||
|
- 'neutron-gateway:neutron-plugin-api'
|
||||||
|
|
||||||
|
- - 'neutron-api:identity-service'
|
||||||
|
- 'keystone:identity-service'
|
||||||
|
|
||||||
|
- - 'nova-compute:neutron-plugin'
|
||||||
|
- 'neutron-openvswitch:neutron-plugin'
|
||||||
|
|
||||||
|
- - 'nova-cloud-controller:shared-db'
|
||||||
|
- 'nova-cloud-controller-mysql-router:shared-db'
|
||||||
|
- - 'nova-cloud-controller-mysql-router:db-router'
|
||||||
|
- 'mysql-innodb-cluster:db-router'
|
||||||
|
|
||||||
|
- - 'neutron-gateway:amqp'
|
||||||
|
- 'rabbitmq-server:amqp'
|
||||||
|
|
||||||
|
- - 'nova-cloud-controller:amqp'
|
||||||
|
- 'rabbitmq-server:amqp'
|
||||||
|
|
||||||
|
- - 'nova-compute:amqp'
|
||||||
|
- 'rabbitmq-server:amqp'
|
||||||
|
|
||||||
|
- - 'neutron-openvswitch:amqp'
|
||||||
|
- 'rabbitmq-server:amqp'
|
||||||
|
|
||||||
|
- - 'nova-cloud-controller:identity-service'
|
||||||
|
- 'keystone:identity-service'
|
||||||
|
|
||||||
|
- - 'nova-cloud-controller:cloud-compute'
|
||||||
|
- 'nova-compute:cloud-compute'
|
||||||
|
|
||||||
|
- - '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:image-service'
|
||||||
|
- 'glance:image-service'
|
||||||
|
|
||||||
|
- - 'nova-cloud-controller:quantum-network-service'
|
||||||
|
- 'neutron-gateway:quantum-network-service'
|
||||||
|
|
||||||
|
- - 'placement:placement'
|
||||||
|
- 'nova-cloud-controller:placement'
|
||||||
|
|
||||||
|
- - 'placement: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'
|
||||||
|
|
||||||
|
- - 'nrpe:nrpe-external-master'
|
||||||
|
- 'manila:nrpe-external-master'
|
|
@ -124,7 +124,7 @@ services:
|
||||||
channel: latest/edge
|
channel: latest/edge
|
||||||
|
|
||||||
manila:
|
manila:
|
||||||
charm: ../../../manila_ubuntu-22.04-amd64_ubuntu-22.10-amd64.charm
|
charm: ../../../manila_ubuntu-22.04-amd64_ubuntu-22.10-amd64_ubuntu-23.04-amd64.charm
|
||||||
num_units: 3
|
num_units: 3
|
||||||
options:
|
options:
|
||||||
default-share-backend: cephfsnfs1
|
default-share-backend: cephfsnfs1
|
||||||
|
|
|
@ -124,7 +124,7 @@ services:
|
||||||
channel: latest/edge
|
channel: latest/edge
|
||||||
|
|
||||||
manila:
|
manila:
|
||||||
charm: ../../../manila_ubuntu-22.04-amd64_ubuntu-22.10-amd64.charm
|
charm: ../../../manila_ubuntu-22.04-amd64_ubuntu-22.10-amd64_ubuntu-23.04-amd64.charm
|
||||||
num_units: 3
|
num_units: 3
|
||||||
options:
|
options:
|
||||||
default-share-backend: cephfsnfs1
|
default-share-backend: cephfsnfs1
|
||||||
|
|
|
@ -3,7 +3,7 @@ variables:
|
||||||
|
|
||||||
local_overlay_enabled: False
|
local_overlay_enabled: False
|
||||||
|
|
||||||
series: jammy
|
series: lunar
|
||||||
|
|
||||||
comment:
|
comment:
|
||||||
- 'machines section to decide order of deployment. database sooner = faster'
|
- 'machines section to decide order of deployment. database sooner = faster'
|
||||||
|
@ -124,7 +124,7 @@ services:
|
||||||
channel: latest/edge
|
channel: latest/edge
|
||||||
|
|
||||||
manila:
|
manila:
|
||||||
charm: ../../../manila_ubuntu-22.04-amd64_ubuntu-22.10-amd64.charm
|
charm: ../../../manila_ubuntu-22.04-amd64_ubuntu-22.10-amd64_ubuntu-23.04-amd64.charm
|
||||||
num_units: 3
|
num_units: 3
|
||||||
options:
|
options:
|
||||||
default-share-backend: cephfsnfs1
|
default-share-backend: cephfsnfs1
|
|
@ -1,15 +1,15 @@
|
||||||
charm_name: manila
|
charm_name: manila
|
||||||
|
|
||||||
gate_bundles:
|
gate_bundles:
|
||||||
- jammy-yoga
|
- jammy-zed
|
||||||
|
|
||||||
dev_bundles:
|
dev_bundles:
|
||||||
- jammy-yoga
|
- jammy-antelope
|
||||||
- jammy-zed
|
|
||||||
- kinetic-zed
|
- kinetic-zed
|
||||||
|
- lunar-antelope
|
||||||
|
|
||||||
smoke_bundles:
|
smoke_bundles:
|
||||||
- jammy-yoga
|
- jammy-zed
|
||||||
|
|
||||||
target_deploy_status:
|
target_deploy_status:
|
||||||
nrpe:
|
nrpe:
|
||||||
|
@ -34,6 +34,7 @@ tests_options:
|
||||||
force_deploy:
|
force_deploy:
|
||||||
# nrpe charm doesn't support jammy+ and needs to be force installed
|
# nrpe charm doesn't support jammy+ and needs to be force installed
|
||||||
# https://bugs.launchpad.net/charm-nrpe/+bug/1968008
|
# https://bugs.launchpad.net/charm-nrpe/+bug/1968008
|
||||||
- jammy-yoga
|
|
||||||
- jammy-zed
|
- jammy-zed
|
||||||
|
- jammy-antelope
|
||||||
- kinetic-zed
|
- kinetic-zed
|
||||||
|
- lunar-antelope
|
||||||
|
|
Loading…
Reference in New Issue