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: I9a331f317991169608803bd4f97a2c704e200568
This commit is contained in:
Alex Kavanagh 2024-02-09 18:15:47 +00:00
parent f92e04da7f
commit 936ba9cb9f
7 changed files with 24 additions and 232 deletions

View File

@ -25,6 +25,3 @@ bases:
- name: ubuntu
channel: "22.10"
architectures: [amd64, s390x, ppc64el, arm64]
- name: ubuntu
channel: "23.04"
architectures: [amd64, s390x, ppc64el, arm64]

View File

@ -16,4 +16,4 @@
needs_charm_build: true
charm_build_name: neutron-api-plugin-arista
build_type: charmcraft
charmcraft_channel: 2.1/stable
charmcraft_channel: 2.x/stable

View File

@ -11,7 +11,6 @@ subordinate: true
series:
- jammy
- kinetic
- lunar
provides:
neutron-plugin-api-subordinate:
interface: neutron-plugin-api-subordinate

View File

@ -35,14 +35,14 @@ applications:
num_units: 1
options:
openstack-origin: *openstack-origin
channel: latest/edge
channel: 2024.1/edge
keystone:
charm: ch:keystone
num_units: 1
options:
openstack-origin: *openstack-origin
channel: latest/edge
channel: 2024.1/edge
neutron-api:
charm: ch:neutron-api
@ -65,7 +65,7 @@ applications:
reverse-dns-lookup: False
dns-domain:
manage-neutron-plugin-legacy-mode: False
channel: latest/edge
channel: 2024.1/edge
neutron-openvswitch:
charm: ch:neutron-openvswitch
@ -76,7 +76,7 @@ applications:
enable-local-dhcp-and-metadata: True
bridge-mappings: default:br-data
data-port: ens7
channel: latest/edge
channel: 2024.1/edge
nova-cloud-controller:
charm: ch:nova-cloud-controller
@ -84,7 +84,7 @@ applications:
options:
openstack-origin: *openstack-origin
network-manager: Neutron
channel: latest/edge
channel: 2024.1/edge
neutron-api-plugin-arista:
charm: ../../../neutron-api-plugin-arista.charm
@ -104,7 +104,7 @@ applications:
num_units: 1
options:
openstack-origin: *openstack-origin
channel: latest/edge
channel: 2024.1/edge
nova-compute:
charm: ch:nova-compute
@ -116,7 +116,7 @@ applications:
enable-live-migration: true
enable-resize: true
migration-auth-type: ssh
channel: latest/edge
channel: 2024.1/edge
rabbitmq-server:
charm: ch:rabbitmq-server

View File

@ -35,14 +35,14 @@ applications:
num_units: 1
options:
openstack-origin: *openstack-origin
channel: latest/edge
channel: 2024.1/edge
keystone:
charm: ch:keystone
num_units: 1
options:
openstack-origin: *openstack-origin
channel: latest/edge
channel: 2024.1/edge
neutron-api:
charm: ch:neutron-api
@ -65,7 +65,7 @@ applications:
reverse-dns-lookup: False
dns-domain:
manage-neutron-plugin-legacy-mode: False
channel: latest/edge
channel: 2024.1/edge
neutron-openvswitch:
charm: ch:neutron-openvswitch
@ -76,7 +76,7 @@ applications:
enable-local-dhcp-and-metadata: True
bridge-mappings: default:br-data
data-port: ens7
channel: latest/edge
channel: 2024.1/edge
nova-cloud-controller:
charm: ch:nova-cloud-controller
@ -84,7 +84,7 @@ applications:
options:
openstack-origin: *openstack-origin
network-manager: Neutron
channel: latest/edge
channel: 2024.1/edge
neutron-api-plugin-arista:
charm: ../../../neutron-api-plugin-arista.charm
@ -104,7 +104,7 @@ applications:
num_units: 1
options:
openstack-origin: *openstack-origin
channel: latest/edge
channel: 2024.1/edge
nova-compute:
charm: ch:nova-compute
@ -116,7 +116,7 @@ applications:
enable-live-migration: true
enable-resize: true
migration-auth-type: ssh
channel: latest/edge
channel: 2024.1/edge
rabbitmq-server:
charm: ch:rabbitmq-server

View File

@ -1,200 +0,0 @@
variables:
openstack-origin: &openstack-origin distro
local_overlay_enabled: False
series: &series lunar
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

View File

@ -1,26 +1,22 @@
charm_name: neutron-api-plugin-arista
smoke_bundles:
- jammy-zed
- jammy-caracal
gate_bundles:
- jammy-zed
dev_bundles:
- jammy-antelope
- lunar-antelope
- jammy-bobcat
- jammy-caracal
dev_bundles:
- noble-caracal
before_deploy:
- zaza.openstack.charm_tests.neutron_arista.setup.download_arista_image
- zaza.openstack.charm_tests.neutron_arista.setup.download_arista_image
configure:
- zaza.openstack.charm_tests.neutron_arista.setup.test_fixture
- zaza.openstack.charm_tests.neutron_arista.setup.test_fixture
tests:
- zaza.openstack.charm_tests.neutron_arista.tests.NeutronCreateAristaNetworkTest
- zaza.openstack.charm_tests.neutron_arista.tests.NeutronCreateAristaNetworkTest
tests_options:
force_deploy:
- jammy-zed
- jammy-antelope
- lunar-antelope
- noble-caracal