Add 2023.1 Bobcat support
* 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 and .zuul.yaml * update build-on and run-on bases Change-Id: I2deb9251605fb91a88f9ac9c1959a7c9981d47bf
This commit is contained in:
parent
f92e04da7f
commit
3533ff6cec
|
@ -28,3 +28,6 @@ bases:
|
||||||
- name: ubuntu
|
- name: ubuntu
|
||||||
channel: "23.04"
|
channel: "23.04"
|
||||||
architectures: [amd64, s390x, ppc64el, arm64]
|
architectures: [amd64, s390x, ppc64el, arm64]
|
||||||
|
- name: ubuntu
|
||||||
|
channel: "23.10"
|
||||||
|
architectures: [amd64, s390x, ppc64el, arm64]
|
||||||
|
|
|
@ -12,6 +12,7 @@ series:
|
||||||
- jammy
|
- jammy
|
||||||
- kinetic
|
- kinetic
|
||||||
- lunar
|
- lunar
|
||||||
|
- mantic
|
||||||
provides:
|
provides:
|
||||||
neutron-plugin-api-subordinate:
|
neutron-plugin-api-subordinate:
|
||||||
interface: neutron-plugin-api-subordinate
|
interface: neutron-plugin-api-subordinate
|
||||||
|
|
|
@ -0,0 +1,197 @@
|
||||||
|
variables:
|
||||||
|
openstack-origin: &openstack-origin cloud:jammy-bobcat
|
||||||
|
|
||||||
|
local_overlay_enabled: False
|
||||||
|
|
||||||
|
series: &series jammy
|
||||||
|
|
||||||
|
applications:
|
||||||
|
|
||||||
|
keystone-mysql-router:
|
||||||
|
charm: ch:mysql-router
|
||||||
|
channel: latest/edge
|
||||||
|
nova-mysql-router:
|
||||||
|
charm: ch:mysql-router
|
||||||
|
channel: latest/edge
|
||||||
|
glance-mysql-router:
|
||||||
|
charm: ch:mysql-router
|
||||||
|
channel: latest/edge
|
||||||
|
neutron-mysql-router:
|
||||||
|
charm: ch:mysql-router
|
||||||
|
channel: latest/edge
|
||||||
|
placement-mysql-router:
|
||||||
|
charm: ch:mysql-router
|
||||||
|
channel: latest/edge
|
||||||
|
mysql-innodb-cluster:
|
||||||
|
constraints: mem=3072M
|
||||||
|
charm: ch:mysql-innodb-cluster
|
||||||
|
num_units: 3
|
||||||
|
options:
|
||||||
|
source: *openstack-origin
|
||||||
|
channel: latest/edge
|
||||||
|
|
||||||
|
glance:
|
||||||
|
charm: ch:glance
|
||||||
|
num_units: 1
|
||||||
|
options:
|
||||||
|
openstack-origin: *openstack-origin
|
||||||
|
channel: latest/edge
|
||||||
|
|
||||||
|
keystone:
|
||||||
|
charm: ch:keystone
|
||||||
|
num_units: 1
|
||||||
|
options:
|
||||||
|
openstack-origin: *openstack-origin
|
||||||
|
channel: latest/edge
|
||||||
|
|
||||||
|
neutron-api:
|
||||||
|
charm: ch:neutron-api
|
||||||
|
num_units: 1
|
||||||
|
options:
|
||||||
|
openstack-origin: *openstack-origin
|
||||||
|
enable-ml2-dns: False
|
||||||
|
flat-network-providers: default
|
||||||
|
vlan-ranges: default:1000:3000
|
||||||
|
vni-ranges: 1001:2000
|
||||||
|
neutron-security-groups: True
|
||||||
|
overlay-network-type: vxlan
|
||||||
|
use-internal-endpoints: True
|
||||||
|
enable-l3ha: True
|
||||||
|
dhcp-agents-per-network: 2
|
||||||
|
enable-ml2-port-security: True
|
||||||
|
default-tenant-network-type: vlan
|
||||||
|
l2-population: False
|
||||||
|
ipv4-ptr-zone-prefix-size:
|
||||||
|
reverse-dns-lookup: False
|
||||||
|
dns-domain:
|
||||||
|
manage-neutron-plugin-legacy-mode: False
|
||||||
|
channel: latest/edge
|
||||||
|
|
||||||
|
neutron-openvswitch:
|
||||||
|
charm: ch:neutron-openvswitch
|
||||||
|
num_units: 0
|
||||||
|
options:
|
||||||
|
prevent-arp-spoofing: True
|
||||||
|
firewall-driver: openvswitch
|
||||||
|
enable-local-dhcp-and-metadata: True
|
||||||
|
bridge-mappings: default:br-data
|
||||||
|
data-port: ens7
|
||||||
|
channel: latest/edge
|
||||||
|
|
||||||
|
nova-cloud-controller:
|
||||||
|
charm: ch:nova-cloud-controller
|
||||||
|
num_units: 1
|
||||||
|
options:
|
||||||
|
openstack-origin: *openstack-origin
|
||||||
|
network-manager: Neutron
|
||||||
|
channel: latest/edge
|
||||||
|
|
||||||
|
neutron-api-plugin-arista:
|
||||||
|
charm: ../../../neutron-api-plugin-arista.charm
|
||||||
|
num_units: 0
|
||||||
|
options:
|
||||||
|
source: *openstack-origin
|
||||||
|
|
||||||
|
# Fake IP, will be set to arista-virt-test-fixture's IP address on test
|
||||||
|
# setup:
|
||||||
|
eapi-host: 192.0.2.42
|
||||||
|
eapi-username: admin
|
||||||
|
eapi-password: password123
|
||||||
|
api-type: EAPI
|
||||||
|
|
||||||
|
placement:
|
||||||
|
charm: ch:placement
|
||||||
|
num_units: 1
|
||||||
|
options:
|
||||||
|
openstack-origin: *openstack-origin
|
||||||
|
channel: latest/edge
|
||||||
|
|
||||||
|
nova-compute:
|
||||||
|
charm: ch:nova-compute
|
||||||
|
num_units: 2
|
||||||
|
constraints: mem=4G cores=4
|
||||||
|
options:
|
||||||
|
openstack-origin: *openstack-origin
|
||||||
|
config-flags: default_ephemeral_format=ext4
|
||||||
|
enable-live-migration: true
|
||||||
|
enable-resize: true
|
||||||
|
migration-auth-type: ssh
|
||||||
|
channel: latest/edge
|
||||||
|
|
||||||
|
rabbitmq-server:
|
||||||
|
charm: ch:rabbitmq-server
|
||||||
|
num_units: 1
|
||||||
|
channel: latest/edge
|
||||||
|
|
||||||
|
lldpd:
|
||||||
|
charm: cs:lldpd
|
||||||
|
options:
|
||||||
|
interfaces-regex: 'en*'
|
||||||
|
short-name: true
|
||||||
|
|
||||||
|
arista-virt-test-fixture:
|
||||||
|
series: focal
|
||||||
|
charm: cs:~openstack-charmers-next/arista-virt-test-fixture
|
||||||
|
num_units: 1
|
||||||
|
constraints: mem=4G
|
||||||
|
|
||||||
|
relations:
|
||||||
|
- - keystone:shared-db
|
||||||
|
- keystone-mysql-router:shared-db
|
||||||
|
- - nova-cloud-controller:shared-db
|
||||||
|
- nova-mysql-router:shared-db
|
||||||
|
- - glance:shared-db
|
||||||
|
- glance-mysql-router:shared-db
|
||||||
|
- - neutron-api:shared-db
|
||||||
|
- neutron-mysql-router:shared-db
|
||||||
|
- - placement:shared-db
|
||||||
|
- placement-mysql-router:shared-db
|
||||||
|
- - keystone-mysql-router:db-router
|
||||||
|
- mysql-innodb-cluster:db-router
|
||||||
|
- - nova-mysql-router:db-router
|
||||||
|
- mysql-innodb-cluster:db-router
|
||||||
|
- - glance-mysql-router:db-router
|
||||||
|
- mysql-innodb-cluster:db-router
|
||||||
|
- - neutron-mysql-router:db-router
|
||||||
|
- mysql-innodb-cluster:db-router
|
||||||
|
- - placement-mysql-router:db-router
|
||||||
|
- mysql-innodb-cluster:db-router
|
||||||
|
|
||||||
|
- - nova-compute:amqp
|
||||||
|
- rabbitmq-server:amqp
|
||||||
|
- - nova-cloud-controller:identity-service
|
||||||
|
- keystone:identity-service
|
||||||
|
- - glance:identity-service
|
||||||
|
- keystone:identity-service
|
||||||
|
- - neutron-api:identity-service
|
||||||
|
- keystone:identity-service
|
||||||
|
- - neutron-openvswitch:neutron-plugin-api
|
||||||
|
- neutron-api:neutron-plugin-api
|
||||||
|
- - neutron-api:amqp
|
||||||
|
- rabbitmq-server:amqp
|
||||||
|
- - glance:amqp
|
||||||
|
- rabbitmq-server:amqp
|
||||||
|
- - nova-cloud-controller:image-service
|
||||||
|
- glance:image-service
|
||||||
|
- - nova-compute:image-service
|
||||||
|
- glance:image-service
|
||||||
|
- - nova-cloud-controller:cloud-compute
|
||||||
|
- nova-compute:cloud-compute
|
||||||
|
- - nova-cloud-controller:amqp
|
||||||
|
- rabbitmq-server:amqp
|
||||||
|
- - nova-compute:neutron-plugin
|
||||||
|
- neutron-openvswitch:neutron-plugin
|
||||||
|
- - neutron-openvswitch:amqp
|
||||||
|
- rabbitmq-server:amqp
|
||||||
|
- - nova-cloud-controller:neutron-api
|
||||||
|
- neutron-api:neutron-api
|
||||||
|
- - neutron-api
|
||||||
|
- neutron-api-plugin-arista
|
||||||
|
- - neutron-api:neutron-plugin-api-subordinate
|
||||||
|
- neutron-api-plugin-arista:neutron-plugin-api-subordinate
|
||||||
|
- - lldpd
|
||||||
|
- nova-compute
|
||||||
|
- - placement:identity-service
|
||||||
|
- keystone:identity-service
|
||||||
|
- - placement:placement
|
||||||
|
- nova-cloud-controller:placement
|
|
@ -0,0 +1,200 @@
|
||||||
|
variables:
|
||||||
|
openstack-origin: &openstack-origin distro
|
||||||
|
|
||||||
|
local_overlay_enabled: False
|
||||||
|
|
||||||
|
series: &series mantic
|
||||||
|
|
||||||
|
applications:
|
||||||
|
|
||||||
|
keystone-mysql-router:
|
||||||
|
charm: ch:mysql-router
|
||||||
|
channel: latest/edge
|
||||||
|
nova-mysql-router:
|
||||||
|
charm: ch:mysql-router
|
||||||
|
channel: latest/edge
|
||||||
|
glance-mysql-router:
|
||||||
|
charm: ch:mysql-router
|
||||||
|
channel: latest/edge
|
||||||
|
neutron-mysql-router:
|
||||||
|
charm: ch:mysql-router
|
||||||
|
channel: latest/edge
|
||||||
|
placement-mysql-router:
|
||||||
|
charm: ch:mysql-router
|
||||||
|
channel: latest/edge
|
||||||
|
mysql-innodb-cluster:
|
||||||
|
constraints: mem=3072M
|
||||||
|
charm: ch:mysql-innodb-cluster
|
||||||
|
num_units: 3
|
||||||
|
options:
|
||||||
|
source: *openstack-origin
|
||||||
|
channel: latest/edge
|
||||||
|
|
||||||
|
glance:
|
||||||
|
charm: ch:glance
|
||||||
|
num_units: 1
|
||||||
|
options:
|
||||||
|
openstack-origin: *openstack-origin
|
||||||
|
channel: latest/edge
|
||||||
|
|
||||||
|
keystone:
|
||||||
|
charm: ch:keystone
|
||||||
|
num_units: 1
|
||||||
|
options:
|
||||||
|
openstack-origin: *openstack-origin
|
||||||
|
channel: latest/edge
|
||||||
|
|
||||||
|
neutron-api:
|
||||||
|
charm: ch:neutron-api
|
||||||
|
num_units: 1
|
||||||
|
options:
|
||||||
|
openstack-origin: *openstack-origin
|
||||||
|
enable-ml2-dns: False
|
||||||
|
flat-network-providers: default
|
||||||
|
vlan-ranges: default:1000:3000
|
||||||
|
vni-ranges: 1001:2000
|
||||||
|
neutron-security-groups: True
|
||||||
|
overlay-network-type: vxlan
|
||||||
|
use-internal-endpoints: True
|
||||||
|
enable-l3ha: True
|
||||||
|
dhcp-agents-per-network: 2
|
||||||
|
enable-ml2-port-security: True
|
||||||
|
default-tenant-network-type: vlan
|
||||||
|
l2-population: False
|
||||||
|
ipv4-ptr-zone-prefix-size:
|
||||||
|
reverse-dns-lookup: False
|
||||||
|
dns-domain:
|
||||||
|
manage-neutron-plugin-legacy-mode: False
|
||||||
|
channel: latest/edge
|
||||||
|
|
||||||
|
neutron-openvswitch:
|
||||||
|
charm: ch:neutron-openvswitch
|
||||||
|
num_units: 0
|
||||||
|
options:
|
||||||
|
prevent-arp-spoofing: True
|
||||||
|
firewall-driver: openvswitch
|
||||||
|
enable-local-dhcp-and-metadata: True
|
||||||
|
bridge-mappings: default:br-data
|
||||||
|
data-port: ens7
|
||||||
|
channel: latest/edge
|
||||||
|
|
||||||
|
nova-cloud-controller:
|
||||||
|
charm: ch:nova-cloud-controller
|
||||||
|
num_units: 1
|
||||||
|
options:
|
||||||
|
openstack-origin: *openstack-origin
|
||||||
|
network-manager: Neutron
|
||||||
|
channel: latest/edge
|
||||||
|
|
||||||
|
neutron-api-plugin-arista:
|
||||||
|
charm: ../../../neutron-api-plugin-arista.charm
|
||||||
|
num_units: 0
|
||||||
|
options:
|
||||||
|
source: *openstack-origin
|
||||||
|
|
||||||
|
# Fake IP, will be set to arista-virt-test-fixture's IP address on test
|
||||||
|
# setup:
|
||||||
|
eapi-host: 192.0.2.42
|
||||||
|
eapi-username: admin
|
||||||
|
eapi-password: password123
|
||||||
|
api-type: EAPI
|
||||||
|
|
||||||
|
placement:
|
||||||
|
charm: ch:placement
|
||||||
|
num_units: 1
|
||||||
|
options:
|
||||||
|
openstack-origin: *openstack-origin
|
||||||
|
channel: latest/edge
|
||||||
|
|
||||||
|
nova-compute:
|
||||||
|
charm: ch:nova-compute
|
||||||
|
num_units: 2
|
||||||
|
constraints: mem=4G cores=4
|
||||||
|
options:
|
||||||
|
openstack-origin: *openstack-origin
|
||||||
|
config-flags: default_ephemeral_format=ext4
|
||||||
|
enable-live-migration: true
|
||||||
|
enable-resize: true
|
||||||
|
migration-auth-type: ssh
|
||||||
|
channel: latest/edge
|
||||||
|
|
||||||
|
rabbitmq-server:
|
||||||
|
charm: ch:rabbitmq-server
|
||||||
|
num_units: 1
|
||||||
|
channel: latest/edge
|
||||||
|
|
||||||
|
lldpd:
|
||||||
|
charm: cs:lldpd
|
||||||
|
options:
|
||||||
|
interfaces-regex: 'en*'
|
||||||
|
short-name: true
|
||||||
|
|
||||||
|
arista-virt-test-fixture:
|
||||||
|
# NOTE(lourot): workaround - this charm doesn't work on hirsute+ yet
|
||||||
|
# see https://github.com/openstack-charmers/charm-arista-virt-test-fixture/issues/11
|
||||||
|
series: groovy
|
||||||
|
|
||||||
|
charm: cs:~openstack-charmers-next/arista-virt-test-fixture
|
||||||
|
num_units: 1
|
||||||
|
constraints: mem=4G
|
||||||
|
|
||||||
|
relations:
|
||||||
|
- - keystone:shared-db
|
||||||
|
- keystone-mysql-router:shared-db
|
||||||
|
- - nova-cloud-controller:shared-db
|
||||||
|
- nova-mysql-router:shared-db
|
||||||
|
- - glance:shared-db
|
||||||
|
- glance-mysql-router:shared-db
|
||||||
|
- - neutron-api:shared-db
|
||||||
|
- neutron-mysql-router:shared-db
|
||||||
|
- - placement:shared-db
|
||||||
|
- placement-mysql-router:shared-db
|
||||||
|
- - keystone-mysql-router:db-router
|
||||||
|
- mysql-innodb-cluster:db-router
|
||||||
|
- - nova-mysql-router:db-router
|
||||||
|
- mysql-innodb-cluster:db-router
|
||||||
|
- - glance-mysql-router:db-router
|
||||||
|
- mysql-innodb-cluster:db-router
|
||||||
|
- - neutron-mysql-router:db-router
|
||||||
|
- mysql-innodb-cluster:db-router
|
||||||
|
- - placement-mysql-router:db-router
|
||||||
|
- mysql-innodb-cluster:db-router
|
||||||
|
|
||||||
|
- - nova-compute:amqp
|
||||||
|
- rabbitmq-server:amqp
|
||||||
|
- - nova-cloud-controller:identity-service
|
||||||
|
- keystone:identity-service
|
||||||
|
- - glance:identity-service
|
||||||
|
- keystone:identity-service
|
||||||
|
- - neutron-api:identity-service
|
||||||
|
- keystone:identity-service
|
||||||
|
- - neutron-openvswitch:neutron-plugin-api
|
||||||
|
- neutron-api:neutron-plugin-api
|
||||||
|
- - neutron-api:amqp
|
||||||
|
- rabbitmq-server:amqp
|
||||||
|
- - glance:amqp
|
||||||
|
- rabbitmq-server:amqp
|
||||||
|
- - nova-cloud-controller:image-service
|
||||||
|
- glance:image-service
|
||||||
|
- - nova-compute:image-service
|
||||||
|
- glance:image-service
|
||||||
|
- - nova-cloud-controller:cloud-compute
|
||||||
|
- nova-compute:cloud-compute
|
||||||
|
- - nova-cloud-controller:amqp
|
||||||
|
- rabbitmq-server:amqp
|
||||||
|
- - nova-compute:neutron-plugin
|
||||||
|
- neutron-openvswitch:neutron-plugin
|
||||||
|
- - neutron-openvswitch:amqp
|
||||||
|
- rabbitmq-server:amqp
|
||||||
|
- - nova-cloud-controller:neutron-api
|
||||||
|
- neutron-api:neutron-api
|
||||||
|
- - neutron-api
|
||||||
|
- neutron-api-plugin-arista
|
||||||
|
- - neutron-api:neutron-plugin-api-subordinate
|
||||||
|
- neutron-api-plugin-arista:neutron-plugin-api-subordinate
|
||||||
|
- - lldpd
|
||||||
|
- nova-compute
|
||||||
|
- - placement:identity-service
|
||||||
|
- keystone:identity-service
|
||||||
|
- - placement:placement
|
||||||
|
- nova-cloud-controller:placement
|
|
@ -8,7 +8,9 @@ gate_bundles:
|
||||||
|
|
||||||
dev_bundles:
|
dev_bundles:
|
||||||
- jammy-antelope
|
- jammy-antelope
|
||||||
|
- jammy-bobcat
|
||||||
- lunar-antelope
|
- lunar-antelope
|
||||||
|
- mantic-bobcat
|
||||||
|
|
||||||
before_deploy:
|
before_deploy:
|
||||||
- zaza.openstack.charm_tests.neutron_arista.setup.download_arista_image
|
- zaza.openstack.charm_tests.neutron_arista.setup.download_arista_image
|
||||||
|
@ -23,4 +25,6 @@ tests_options:
|
||||||
force_deploy:
|
force_deploy:
|
||||||
- jammy-zed
|
- jammy-zed
|
||||||
- jammy-antelope
|
- jammy-antelope
|
||||||
|
- jammy-bobcat
|
||||||
- lunar-antelope
|
- lunar-antelope
|
||||||
|
- mantic-bobcat
|
||||||
|
|
Loading…
Reference in New Issue