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: Ie58f8722e4eeb06048084fd72c21f1fd614222af
This commit is contained in:
Alex Kavanagh 2024-02-09 18:15:47 +00:00 committed by Billy Olsen
parent a008114a9c
commit 000e53df53
No known key found for this signature in database
GPG Key ID: 6A8CA9BDB5995260
14 changed files with 62 additions and 1193 deletions

View File

@ -54,67 +54,3 @@ bases:
- name: ubuntu - name: ubuntu
channel: "22.04" channel: "22.04"
architectures: [arm64] 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]

View File

@ -3,13 +3,11 @@
- charm-unit-jobs-py310 - charm-unit-jobs-py310
check: check:
jobs: jobs:
- jammy-antelope
- jammy-antelope-ovn
- jammy-bobcat - jammy-bobcat
- jammy-bobcat-ovn - jammy-bobcat-ovn
- lunar-antelope: - jammy-caracal:
voting: false voting: false
- lunar-antelope-ovn: - jammy-caracal-ovn:
voting: false voting: false
vars: vars:
needs_charm_build: true needs_charm_build: true
@ -18,16 +16,12 @@
charmcraft_channel: 2.x/stable charmcraft_channel: 2.x/stable
- job: - job:
name: jammy-antelope-ovn name: jammy-caracal-ovn
parent: func-target parent: func-target
vars: vars:
juju_snap_channel: '3.1/stable'
pip_constraints_url: 'https://raw.githubusercontent.com/openstack-charmers/zaza-openstack-tests/master/constraints/constraints-2024.1.txt'
tox_extra_args: '-- jammy-antelope-ovn' tox_extra_args: '-- jammy-antelope-ovn'
- job:
name: lunar-antelope-ovn
parent: func-target
vars:
juju_snap_channel: "3.2/stable"
tox_extra_args: '-- lunar-antelope-ovn'
- job: - job:
name: jammy-bobcat-ovn name: jammy-bobcat-ovn
parent: func-target parent: func-target

View File

@ -5,11 +5,9 @@ description: |
Neutron Dynamic Routing Agent acts as a BGP speaker advertising OpenStack Neutron Dynamic Routing Agent acts as a BGP speaker advertising OpenStack
networks to the BGP infrastructure. networks to the BGP infrastructure.
tags: tags:
- openstack - openstack
series: series:
- jammy - jammy
- lunar
- mantic
subordinate: false subordinate: false
extra-bindings: extra-bindings:
# Used to specify the OpenStack provider network interface # Used to specify the OpenStack provider network interface

View File

@ -1,270 +0,0 @@
local_overlay_enabled: False
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':
'5':
'6':
'7':
# osci-frr has a limited set of supported series.
series: jammy
'8':
'9':
'10':
'11':
applications:
keystone-mysql-router:
charm: ch:mysql-router
channel: latest/edge
neutron-api-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
placement-mysql-router:
charm: ch:mysql-router
channel: latest/edge
mysql-innodb-cluster:
charm: ch:mysql-innodb-cluster
num_units: 3
to:
- '0'
- '1'
- '2'
channel: latest/edge
keystone:
charm: ch:keystone
num_units: 1
options:
openstack-origin: *openstack-origin
haproxy-server-timeout: 90000
haproxy-client-timeout: 90000
haproxy-queue-timeout: 9000
haproxy-connect-timeout: 9000
to:
- '3'
channel: latest/edge
neutron-api:
charm: ch:neutron-api
num_units: 1
options:
flat-network-providers: physnet1,
neutron-security-groups: true
openstack-origin: *openstack-origin
haproxy-server-timeout: 90000
haproxy-client-timeout: 90000
haproxy-queue-timeout: 9000
haproxy-connect-timeout: 9000
to:
- '4'
channel: latest/edge
neutron-dynamic-routing:
charm: ../../../neutron-dynamic-routing_ubuntu-22.04-amd64.charm
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '5'
rabbitmq-server:
charm: ch:rabbitmq-server
num_units: 1
to:
- '6'
channel: latest/edge
osci-frr:
charm: ch:osci-frr
series: jammy
num_units: 1
to:
- '7'
ovn-central:
charm: ch:ovn-central
num_units: 3
options:
source: *openstack-origin
channel: latest/edge
to:
- '8'
- '9'
- '10'
neutron-api-plugin-ovn:
charm: ch:neutron-api-plugin-ovn
channel: latest/edge
options:
enable-distributed-floating-ip: True
vault:
charm: ch:vault
num_units: 1
channel: latest/edge
to:
- '11'
nova-compute:
constraints: mem=7168M
charm: ch:nova-compute
num_units: 2
options:
openstack-origin: *openstack-origin
debug: True
channel: latest/edge
nova-cloud-controller:
charm: ch:nova-cloud-controller
num_units: 1
options:
openstack-origin: *openstack-origin
debug: True
network-manager: Neutron
channel: latest/edge
placement:
charm: ch:placement
num_units: 1
constraints: mem=1G
options:
openstack-origin: *openstack-origin
debug: true
channel: latest/edge
glance:
charm: ch:glance
num_units: 1
options:
openstack-origin: *openstack-origin
channel: latest/edge
ovn-chassis:
charm: ch:ovn-chassis
channel: latest/edge
options:
ovn-bridge-mappings: physnet1:br-ex
prefer-chassis-as-gw: true
relations:
- - 'neutron-dynamic-routing:amqp'
- 'rabbitmq-server:amqp'
- - 'neutron-dynamic-routing:bgp-speaker'
- 'osci-frr:bgpclient'
- - '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:identity-service'
- 'keystone:identity-service'
- - 'nova-mysql-router:db-router'
- 'mysql-innodb-cluster:db-router'
- - 'glance-mysql-router:db-router'
- 'mysql-innodb-cluster:db-router'
- - 'placement-mysql-router:db-router'
- 'mysql-innodb-cluster:db-router'
- - keystone:identity-service
- glance:identity-service
- - nova-mysql-router:shared-db
- nova-cloud-controller:shared-db
- - glance:image-service
- nova-cloud-controller:image-service
- - glance:image-service
- nova-compute:image-service
- - glance-mysql-router:shared-db
- glance:shared-db
- - keystone:identity-service
- nova-cloud-controller:identity-service
- - nova-compute:cloud-compute
- nova-cloud-controller:cloud-compute
- - neutron-api:neutron-api
- nova-cloud-controller:neutron-api
- - rabbitmq-server:amqp
- nova-cloud-controller:amqp
- - ovn-chassis:nova-compute
- nova-compute:neutron-plugin
- - ovn-chassis:certificates
- vault:certificates
- - ovn-chassis:ovsdb
- ovn-central:ovsdb
- - rabbitmq-server:amqp
- nova-compute:amqp
- - placement
- placement-mysql-router
- - placement
- keystone
- - placement
- nova-cloud-controller
- - ovn-central:certificates
- vault:certificates
- - ovn-central:ovsdb-cms
- neutron-api-plugin-ovn:ovsdb-cms
- - vault:certificates
- keystone:certificates
- - vault:certificates
- neutron-api:certificates
- - vault:certificates
- neutron-api-plugin-ovn:certificates
- - neutron-api-plugin-ovn:neutron-plugin
- neutron-api:neutron-plugin-api-subordinate
- - vault:certificates
- glance:certificates
- - vault:certificates
- nova-cloud-controller:certificates
- - vault:certificates
- placement:certificates

View File

@ -64,7 +64,7 @@ applications:
haproxy-connect-timeout: 9000 haproxy-connect-timeout: 9000
to: to:
- '3' - '3'
channel: latest/edge channel: 2024.1/edge
neutron-api: neutron-api:
charm: ch:neutron-api charm: ch:neutron-api
@ -79,7 +79,7 @@ applications:
haproxy-connect-timeout: 9000 haproxy-connect-timeout: 9000
to: to:
- '4' - '4'
channel: latest/edge channel: 2024.1/edge
neutron-dynamic-routing: neutron-dynamic-routing:
charm: ../../../neutron-dynamic-routing_ubuntu-22.04-amd64.charm charm: ../../../neutron-dynamic-routing_ubuntu-22.04-amd64.charm
@ -115,7 +115,7 @@ applications:
- '10' - '10'
neutron-api-plugin-ovn: neutron-api-plugin-ovn:
charm: ch:neutron-api-plugin-ovn charm: ch:neutron-api-plugin-ovn
channel: latest/edge channel: 2024.1/edge
options: options:
enable-distributed-floating-ip: True enable-distributed-floating-ip: True
@ -133,7 +133,7 @@ applications:
options: options:
openstack-origin: *openstack-origin openstack-origin: *openstack-origin
debug: True debug: True
channel: latest/edge channel: 2024.1/edge
nova-cloud-controller: nova-cloud-controller:
charm: ch:nova-cloud-controller charm: ch:nova-cloud-controller
@ -142,7 +142,7 @@ applications:
openstack-origin: *openstack-origin openstack-origin: *openstack-origin
debug: True debug: True
network-manager: Neutron network-manager: Neutron
channel: latest/edge channel: 2024.1/edge
placement: placement:
charm: ch:placement charm: ch:placement
@ -151,14 +151,14 @@ applications:
options: options:
openstack-origin: *openstack-origin openstack-origin: *openstack-origin
debug: true debug: true
channel: latest/edge channel: 2024.1/edge
glance: glance:
charm: ch:glance charm: ch:glance
num_units: 1 num_units: 1
options: options:
openstack-origin: *openstack-origin openstack-origin: *openstack-origin
channel: latest/edge channel: 2024.1/edge
ovn-chassis: ovn-chassis:
charm: ch:ovn-chassis charm: ch:ovn-chassis

View File

@ -61,7 +61,7 @@ applications:
haproxy-connect-timeout: 9000 haproxy-connect-timeout: 9000
to: to:
- '3' - '3'
channel: latest/edge channel: 2024.1/edge
neutron-api: neutron-api:
charm: ch:neutron-api charm: ch:neutron-api
@ -80,7 +80,7 @@ applications:
enable-dvr: True enable-dvr: True
to: to:
- '4' - '4'
channel: latest/edge channel: 2024.1/edge
neutron-dynamic-routing: neutron-dynamic-routing:
charm: ../../../neutron-dynamic-routing_ubuntu-22.04-amd64.charm charm: ../../../neutron-dynamic-routing_ubuntu-22.04-amd64.charm
@ -118,7 +118,7 @@ applications:
options: options:
openstack-origin: *openstack-origin openstack-origin: *openstack-origin
debug: True debug: True
channel: latest/edge channel: 2024.1/edge
nova-cloud-controller: nova-cloud-controller:
charm: ch:nova-cloud-controller charm: ch:nova-cloud-controller
@ -127,7 +127,7 @@ applications:
openstack-origin: *openstack-origin openstack-origin: *openstack-origin
debug: True debug: True
network-manager: Neutron network-manager: Neutron
channel: latest/edge channel: 2024.1/edge
placement: placement:
charm: ch:placement charm: ch:placement
@ -136,14 +136,14 @@ applications:
options: options:
openstack-origin: *openstack-origin openstack-origin: *openstack-origin
debug: true debug: true
channel: latest/edge channel: 2024.1/edge
glance: glance:
charm: ch:glance charm: ch:glance
num_units: 1 num_units: 1
options: options:
openstack-origin: *openstack-origin openstack-origin: *openstack-origin
channel: latest/edge channel: 2024.1/edge
neutron-openvswitch: neutron-openvswitch:
charm: ch:neutron-openvswitch charm: ch:neutron-openvswitch
@ -155,7 +155,7 @@ applications:
bridge-mappings: physnet1:br-ex bridge-mappings: physnet1:br-ex
prevent-arp-spoofing: False prevent-arp-spoofing: False
firewall-driver: openvswitch firewall-driver: openvswitch
channel: latest/edge channel: 2024.1/edge
relations: relations:

View File

@ -1,7 +1,7 @@
local_overlay_enabled: False local_overlay_enabled: False
variables: variables:
openstack-origin: &openstack-origin cloud:jammy-antelope openstack-origin: &openstack-origin cloud:jammy-caracal
series: jammy series: jammy
@ -61,7 +61,7 @@ applications:
haproxy-connect-timeout: 9000 haproxy-connect-timeout: 9000
to: to:
- '3' - '3'
channel: latest/edge channel: 2024.1/edge
neutron-api: neutron-api:
charm: ch:neutron-api charm: ch:neutron-api
@ -80,7 +80,7 @@ applications:
enable-dvr: True enable-dvr: True
to: to:
- '4' - '4'
channel: latest/edge channel: 2024.1/edge
neutron-dynamic-routing: neutron-dynamic-routing:
charm: ../../../neutron-dynamic-routing_ubuntu-22.04-amd64.charm charm: ../../../neutron-dynamic-routing_ubuntu-22.04-amd64.charm
@ -118,7 +118,7 @@ applications:
options: options:
openstack-origin: *openstack-origin openstack-origin: *openstack-origin
debug: True debug: True
channel: latest/edge channel: 2024.1/edge
nova-cloud-controller: nova-cloud-controller:
charm: ch:nova-cloud-controller charm: ch:nova-cloud-controller
@ -127,7 +127,7 @@ applications:
openstack-origin: *openstack-origin openstack-origin: *openstack-origin
debug: True debug: True
network-manager: Neutron network-manager: Neutron
channel: latest/edge channel: 2024.1/edge
placement: placement:
charm: ch:placement charm: ch:placement
@ -136,14 +136,14 @@ applications:
options: options:
openstack-origin: *openstack-origin openstack-origin: *openstack-origin
debug: true debug: true
channel: latest/edge channel: 2024.1/edge
glance: glance:
charm: ch:glance charm: ch:glance
num_units: 1 num_units: 1
options: options:
openstack-origin: *openstack-origin openstack-origin: *openstack-origin
channel: latest/edge channel: 2024.1/edge
neutron-openvswitch: neutron-openvswitch:
charm: ch:neutron-openvswitch charm: ch:neutron-openvswitch
@ -155,7 +155,7 @@ applications:
bridge-mappings: physnet1:br-ex bridge-mappings: physnet1:br-ex
prevent-arp-spoofing: False prevent-arp-spoofing: False
firewall-driver: openvswitch firewall-driver: openvswitch
channel: latest/edge channel: 2024.1/edge
relations: relations:

View File

@ -1,270 +0,0 @@
local_overlay_enabled: False
variables:
openstack-origin: &openstack-origin distro
series: lunar
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':
# osci-frr has a limited set of supported series.
series: jammy
'8':
'9':
'10':
'11':
applications:
keystone-mysql-router:
charm: ch:mysql-router
channel: latest/edge
neutron-api-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
placement-mysql-router:
charm: ch:mysql-router
channel: latest/edge
mysql-innodb-cluster:
charm: ch:mysql-innodb-cluster
num_units: 3
to:
- '0'
- '1'
- '2'
channel: latest/edge
keystone:
charm: ch:keystone
num_units: 1
options:
openstack-origin: *openstack-origin
haproxy-server-timeout: 90000
haproxy-client-timeout: 90000
haproxy-queue-timeout: 9000
haproxy-connect-timeout: 9000
to:
- '3'
channel: latest/edge
neutron-api:
charm: ch:neutron-api
num_units: 1
options:
flat-network-providers: physnet1,
neutron-security-groups: true
openstack-origin: *openstack-origin
haproxy-server-timeout: 90000
haproxy-client-timeout: 90000
haproxy-queue-timeout: 9000
haproxy-connect-timeout: 9000
to:
- '4'
channel: latest/edge
neutron-dynamic-routing:
charm: ../../../neutron-dynamic-routing_ubuntu-23.04-amd64.charm
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '5'
rabbitmq-server:
charm: ch:rabbitmq-server
num_units: 1
to:
- '6'
channel: latest/edge
osci-frr:
charm: ch:osci-frr
series: jammy
num_units: 1
to:
- '7'
ovn-central:
charm: ch:ovn-central
num_units: 3
options:
source: *openstack-origin
channel: latest/edge
to:
- '8'
- '9'
- '10'
neutron-api-plugin-ovn:
charm: ch:neutron-api-plugin-ovn
channel: latest/edge
options:
enable-distributed-floating-ip: True
vault:
charm: ch:vault
num_units: 1
channel: latest/edge
to:
- '11'
nova-compute:
constraints: mem=7168M
charm: ch:nova-compute
num_units: 2
options:
openstack-origin: *openstack-origin
debug: True
channel: latest/edge
nova-cloud-controller:
charm: ch:nova-cloud-controller
num_units: 1
options:
openstack-origin: *openstack-origin
debug: True
network-manager: Neutron
channel: latest/edge
placement:
charm: ch:placement
num_units: 1
constraints: mem=1G
options:
openstack-origin: *openstack-origin
debug: true
channel: latest/edge
glance:
charm: ch:glance
num_units: 1
options:
openstack-origin: *openstack-origin
channel: latest/edge
ovn-chassis:
charm: ch:ovn-chassis
channel: latest/edge
options:
ovn-bridge-mappings: physnet1:br-ex
prefer-chassis-as-gw: true
relations:
- - 'neutron-dynamic-routing:amqp'
- 'rabbitmq-server:amqp'
- - 'neutron-dynamic-routing:bgp-speaker'
- 'osci-frr:bgpclient'
- - '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:identity-service'
- 'keystone:identity-service'
- - 'nova-mysql-router:db-router'
- 'mysql-innodb-cluster:db-router'
- - 'glance-mysql-router:db-router'
- 'mysql-innodb-cluster:db-router'
- - 'placement-mysql-router:db-router'
- 'mysql-innodb-cluster:db-router'
- - keystone:identity-service
- glance:identity-service
- - nova-mysql-router:shared-db
- nova-cloud-controller:shared-db
- - glance:image-service
- nova-cloud-controller:image-service
- - glance:image-service
- nova-compute:image-service
- - glance-mysql-router:shared-db
- glance:shared-db
- - keystone:identity-service
- nova-cloud-controller:identity-service
- - nova-compute:cloud-compute
- nova-cloud-controller:cloud-compute
- - neutron-api:neutron-api
- nova-cloud-controller:neutron-api
- - rabbitmq-server:amqp
- nova-cloud-controller:amqp
- - ovn-chassis:nova-compute
- nova-compute:neutron-plugin
- - ovn-chassis:certificates
- vault:certificates
- - ovn-chassis:ovsdb
- ovn-central:ovsdb
- - rabbitmq-server:amqp
- nova-compute:amqp
- - placement
- placement-mysql-router
- - placement
- keystone
- - placement
- nova-cloud-controller
- - ovn-central:certificates
- vault:certificates
- - ovn-central:ovsdb-cms
- neutron-api-plugin-ovn:ovsdb-cms
- - vault:certificates
- keystone:certificates
- - vault:certificates
- neutron-api:certificates
- - vault:certificates
- neutron-api-plugin-ovn:certificates
- - neutron-api-plugin-ovn:neutron-plugin
- neutron-api:neutron-plugin-api-subordinate
- - vault:certificates
- glance:certificates
- - vault:certificates
- nova-cloud-controller:certificates
- - vault:certificates
- placement:certificates

View File

@ -1,270 +0,0 @@
local_overlay_enabled: False
variables:
openstack-origin: &openstack-origin distro
series: mantic
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':
# osci-frr has a limited set of supported series.
series: jammy
'8':
'9':
'10':
'11':
applications:
keystone-mysql-router:
charm: ch:mysql-router
channel: latest/edge
neutron-api-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
placement-mysql-router:
charm: ch:mysql-router
channel: latest/edge
mysql-innodb-cluster:
charm: ch:mysql-innodb-cluster
num_units: 3
to:
- '0'
- '1'
- '2'
channel: latest/edge
keystone:
charm: ch:keystone
num_units: 1
options:
openstack-origin: *openstack-origin
haproxy-server-timeout: 90000
haproxy-client-timeout: 90000
haproxy-queue-timeout: 9000
haproxy-connect-timeout: 9000
to:
- '3'
channel: latest/edge
neutron-api:
charm: ch:neutron-api
num_units: 1
options:
flat-network-providers: physnet1,
neutron-security-groups: true
openstack-origin: *openstack-origin
haproxy-server-timeout: 90000
haproxy-client-timeout: 90000
haproxy-queue-timeout: 9000
haproxy-connect-timeout: 9000
to:
- '4'
channel: latest/edge
neutron-dynamic-routing:
charm: ../../../neutron-dynamic-routing_ubuntu-23.10-amd64.charm
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '5'
rabbitmq-server:
charm: ch:rabbitmq-server
num_units: 1
to:
- '6'
channel: latest/edge
osci-frr:
charm: ch:osci-frr
series: jammy
num_units: 1
to:
- '7'
ovn-central:
charm: ch:ovn-central
num_units: 3
options:
source: *openstack-origin
channel: latest/edge
to:
- '8'
- '9'
- '10'
neutron-api-plugin-ovn:
charm: ch:neutron-api-plugin-ovn
channel: latest/edge
options:
enable-distributed-floating-ip: True
vault:
charm: ch:vault
num_units: 1
channel: latest/edge
to:
- '11'
nova-compute:
constraints: mem=7168M
charm: ch:nova-compute
num_units: 2
options:
openstack-origin: *openstack-origin
debug: True
channel: latest/edge
nova-cloud-controller:
charm: ch:nova-cloud-controller
num_units: 1
options:
openstack-origin: *openstack-origin
debug: True
network-manager: Neutron
channel: latest/edge
placement:
charm: ch:placement
num_units: 1
constraints: mem=1G
options:
openstack-origin: *openstack-origin
debug: true
channel: latest/edge
glance:
charm: ch:glance
num_units: 1
options:
openstack-origin: *openstack-origin
channel: latest/edge
ovn-chassis:
charm: ch:ovn-chassis
channel: latest/edge
options:
ovn-bridge-mappings: physnet1:br-ex
prefer-chassis-as-gw: true
relations:
- - 'neutron-dynamic-routing:amqp'
- 'rabbitmq-server:amqp'
- - 'neutron-dynamic-routing:bgp-speaker'
- 'osci-frr:bgpclient'
- - '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:identity-service'
- 'keystone:identity-service'
- - 'nova-mysql-router:db-router'
- 'mysql-innodb-cluster:db-router'
- - 'glance-mysql-router:db-router'
- 'mysql-innodb-cluster:db-router'
- - 'placement-mysql-router:db-router'
- 'mysql-innodb-cluster:db-router'
- - keystone:identity-service
- glance:identity-service
- - nova-mysql-router:shared-db
- nova-cloud-controller:shared-db
- - glance:image-service
- nova-cloud-controller:image-service
- - glance:image-service
- nova-compute:image-service
- - glance-mysql-router:shared-db
- glance:shared-db
- - keystone:identity-service
- nova-cloud-controller:identity-service
- - nova-compute:cloud-compute
- nova-cloud-controller:cloud-compute
- - neutron-api:neutron-api
- nova-cloud-controller:neutron-api
- - rabbitmq-server:amqp
- nova-cloud-controller:amqp
- - ovn-chassis:nova-compute
- nova-compute:neutron-plugin
- - ovn-chassis:certificates
- vault:certificates
- - ovn-chassis:ovsdb
- ovn-central:ovsdb
- - rabbitmq-server:amqp
- nova-compute:amqp
- - placement
- placement-mysql-router
- - placement
- keystone
- - placement
- nova-cloud-controller
- - ovn-central:certificates
- vault:certificates
- - ovn-central:ovsdb-cms
- neutron-api-plugin-ovn:ovsdb-cms
- - vault:certificates
- keystone:certificates
- - vault:certificates
- neutron-api:certificates
- - vault:certificates
- neutron-api-plugin-ovn:certificates
- - neutron-api-plugin-ovn:neutron-plugin
- neutron-api:neutron-plugin-api-subordinate
- - vault:certificates
- glance:certificates
- - vault:certificates
- nova-cloud-controller:certificates
- - vault:certificates
- placement:certificates

View File

@ -1,248 +0,0 @@
local_overlay_enabled: False
variables:
openstack-origin: &openstack-origin distro
series: mantic
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':
# osci-frr has a limited set of supported series.
series: jammy
'8':
applications:
keystone-mysql-router:
charm: ch:mysql-router
channel: latest/edge
neutron-api-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
placement-mysql-router:
charm: ch:mysql-router
channel: latest/edge
mysql-innodb-cluster:
charm: ch:mysql-innodb-cluster
num_units: 3
to:
- '0'
- '1'
- '2'
channel: latest/edge
keystone:
charm: ch:keystone
num_units: 1
options:
openstack-origin: *openstack-origin
haproxy-server-timeout: 90000
haproxy-client-timeout: 90000
haproxy-queue-timeout: 9000
haproxy-connect-timeout: 9000
to:
- '3'
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
enable-ml2-port-security: True
neutron-security-groups: True
openstack-origin: *openstack-origin
haproxy-server-timeout: 90000
haproxy-client-timeout: 90000
haproxy-queue-timeout: 9000
haproxy-connect-timeout: 9000
enable-dvr: True
to:
- '4'
channel: latest/edge
neutron-dynamic-routing:
charm: ../../../neutron-dynamic-routing_ubuntu-23.10-amd64.charm
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '5'
rabbitmq-server:
charm: ch:rabbitmq-server
num_units: 1
to:
- '6'
channel: latest/edge
osci-frr:
charm: ch:osci-frr
series: jammy
num_units: 1
to:
- '7'
vault:
charm: ch:vault
num_units: 1
channel: latest/edge
to:
- '8'
nova-compute:
constraints: mem=7168M
charm: ch:nova-compute
num_units: 2
options:
openstack-origin: *openstack-origin
debug: True
channel: latest/edge
nova-cloud-controller:
charm: ch:nova-cloud-controller
num_units: 1
options:
openstack-origin: *openstack-origin
debug: True
network-manager: Neutron
channel: latest/edge
placement:
charm: ch:placement
num_units: 1
constraints: mem=1G
options:
openstack-origin: *openstack-origin
debug: true
channel: latest/edge
glance:
charm: ch:glance
num_units: 1
options:
openstack-origin: *openstack-origin
channel: latest/edge
neutron-openvswitch:
charm: ch:neutron-openvswitch
num_units: 0
options:
debug: True
enable-local-dhcp-and-metadata: True
use-dvr-snat: True
bridge-mappings: physnet1:br-ex
prevent-arp-spoofing: False
firewall-driver: openvswitch
channel: latest/edge
relations:
- - 'neutron-dynamic-routing:amqp'
- 'rabbitmq-server:amqp'
- - 'neutron-dynamic-routing:bgp-speaker'
- 'osci-frr:bgpclient'
- - '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:identity-service'
- 'keystone:identity-service'
- - 'nova-mysql-router:db-router'
- 'mysql-innodb-cluster:db-router'
- - 'glance-mysql-router:db-router'
- 'mysql-innodb-cluster:db-router'
- - 'placement-mysql-router:db-router'
- 'mysql-innodb-cluster:db-router'
- - keystone:identity-service
- glance:identity-service
- - nova-mysql-router:shared-db
- nova-cloud-controller:shared-db
- - glance:image-service
- nova-cloud-controller:image-service
- - glance:image-service
- nova-compute:image-service
- - glance-mysql-router:shared-db
- glance:shared-db
- - keystone:identity-service
- nova-cloud-controller:identity-service
- - nova-compute:cloud-compute
- nova-cloud-controller:cloud-compute
- - neutron-api:neutron-api
- nova-cloud-controller:neutron-api
- - rabbitmq-server:amqp
- nova-cloud-controller:amqp
- - rabbitmq-server:amqp
- nova-compute:amqp
- - placement
- placement-mysql-router
- - placement
- keystone
- - placement
- nova-cloud-controller
- - vault:certificates
- keystone:certificates
- - vault:certificates
- neutron-api:certificates
- - vault:certificates
- glance:certificates
- - vault:certificates
- nova-cloud-controller:certificates
- - vault:certificates
- placement:certificates
- - rabbitmq-server:amqp
- neutron-openvswitch:amqp
- - neutron-api:neutron-plugin-api
- neutron-openvswitch:neutron-plugin-api
- - neutron-openvswitch:neutron-plugin
- nova-compute:neutron-plugin

View File

@ -3,7 +3,7 @@ local_overlay_enabled: False
variables: variables:
openstack-origin: &openstack-origin distro openstack-origin: &openstack-origin distro
series: lunar series: noble
comment: comment:
- 'machines section to decide order of deployment. database sooner = faster' - 'machines section to decide order of deployment. database sooner = faster'
@ -61,7 +61,7 @@ applications:
haproxy-connect-timeout: 9000 haproxy-connect-timeout: 9000
to: to:
- '3' - '3'
channel: latest/edge channel: 2024.1/edge
neutron-api: neutron-api:
charm: ch:neutron-api charm: ch:neutron-api
@ -80,10 +80,10 @@ applications:
enable-dvr: True enable-dvr: True
to: to:
- '4' - '4'
channel: latest/edge channel: 2024.1/edge
neutron-dynamic-routing: neutron-dynamic-routing:
charm: ../../../neutron-dynamic-routing_ubuntu-23.04-amd64.charm charm: ../../../neutron-dynamic-routing_ubuntu-22.04-amd64.charm
num_units: 1 num_units: 1
options: options:
openstack-origin: *openstack-origin openstack-origin: *openstack-origin
@ -118,7 +118,7 @@ applications:
options: options:
openstack-origin: *openstack-origin openstack-origin: *openstack-origin
debug: True debug: True
channel: latest/edge channel: 2024.1/edge
nova-cloud-controller: nova-cloud-controller:
charm: ch:nova-cloud-controller charm: ch:nova-cloud-controller
@ -127,7 +127,7 @@ applications:
openstack-origin: *openstack-origin openstack-origin: *openstack-origin
debug: True debug: True
network-manager: Neutron network-manager: Neutron
channel: latest/edge channel: 2024.1/edge
placement: placement:
charm: ch:placement charm: ch:placement
@ -136,14 +136,14 @@ applications:
options: options:
openstack-origin: *openstack-origin openstack-origin: *openstack-origin
debug: true debug: true
channel: latest/edge channel: 2024.1/edge
glance: glance:
charm: ch:glance charm: ch:glance
num_units: 1 num_units: 1
options: options:
openstack-origin: *openstack-origin openstack-origin: *openstack-origin
channel: latest/edge channel: 2024.1/edge
neutron-openvswitch: neutron-openvswitch:
charm: ch:neutron-openvswitch charm: ch:neutron-openvswitch
@ -155,7 +155,7 @@ applications:
bridge-mappings: physnet1:br-ex bridge-mappings: physnet1:br-ex
prevent-arp-spoofing: False prevent-arp-spoofing: False
firewall-driver: openvswitch firewall-driver: openvswitch
channel: latest/edge channel: 2024.1/edge
relations: relations:

View File

@ -1,29 +1,20 @@
charm_name: neutron-dynamic-routing charm_name: neutron-dynamic-routing
configure: configure:
- zaza.openstack.charm_tests.vault.setup.auto_initialize - zaza.openstack.charm_tests.vault.setup.auto_initialize
- zaza.openstack.charm_tests.glance.setup.add_lts_image - zaza.openstack.charm_tests.glance.setup.add_lts_image
- zaza.openstack.charm_tests.nova.setup.create_flavors - zaza.openstack.charm_tests.nova.setup.create_flavors
- zaza.openstack.charm_tests.nova.setup.manage_ssh_key - zaza.openstack.charm_tests.nova.setup.manage_ssh_key
- zaza.openstack.charm_tests.dragent.configure.setup - zaza.openstack.charm_tests.dragent.configure.setup
gate_bundles: gate_bundles:
- jammy-antelope - jammy-antelope
- jammy-antelope-ovn - jammy-bobcat
- jammy-caracal
smoke_bundles: smoke_bundles:
- jammy-antelope-ovn - jammy-caracal
dev_bundles: dev_bundles:
- jammy-antelope - noble-caracal
- jammy-antelope-ovn
- jammy-bobcat
- jammy-bobcat-ovn
- lunar-antelope
- lunar-antelope-ovn
- mantic-bobcat
- mantic-bobcat-ovn
target_deploy_status: target_deploy_status:
neutron-api-plugin-ovn: neutron-api-plugin-ovn:
workload-status: waiting workload-status: waiting
@ -40,8 +31,8 @@ target_deploy_status:
tests: tests:
- zaza.openstack.charm_tests.dragent.tests.DRAgentTest - zaza.openstack.charm_tests.dragent.tests.DRAgentTest
tests_options: tests_options:
force_deploy: force_deploy:
- lunar-antelope - noble-caracal

View File

@ -25,7 +25,9 @@ passenv =
CS_* CS_*
OS_* OS_*
TEST_* TEST_*
deps = -r{toxinidir}/test-requirements.txt deps =
-c {env:TEST_CONSTRAINTS_FILE:https://raw.githubusercontent.com/openstack-charmers/zaza-openstack-tests/master/constraints/constraints-2024.1.txt}
-r{toxinidir}/test-requirements.txt
[testenv:pep8] [testenv:pep8]
basepython = python3 basepython = python3

12
tox.ini
View File

@ -49,12 +49,16 @@ commands =
[testenv:py3] [testenv:py3]
basepython = python3 basepython = python3
deps = -r{toxinidir}/test-requirements.txt deps =
-c {env:TEST_CONSTRAINTS_FILE:https://raw.githubusercontent.com/openstack-charmers/zaza-openstack-tests/master/constraints/constraints-2024.1.txt}
-r{toxinidir}/test-requirements.txt
commands = stestr run --slowest {posargs} commands = stestr run --slowest {posargs}
[testenv:py310] [testenv:py310]
basepython = python3.10 basepython = python3.10
deps = -r{toxinidir}/test-requirements.txt deps =
-c {env:TEST_CONSTRAINTS_FILE:https://raw.githubusercontent.com/openstack-charmers/zaza-openstack-tests/master/constraints/constraints-2024.1.txt}
-r{toxinidir}/test-requirements.txt
commands = stestr run --slowest {posargs} commands = stestr run --slowest {posargs}
[testenv:pep8] [testenv:pep8]
@ -67,7 +71,9 @@ commands = flake8 {posargs} src unit_tests
# Technique based heavily upon # Technique based heavily upon
# https://github.com/openstack/nova/blob/master/tox.ini # https://github.com/openstack/nova/blob/master/tox.ini
basepython = python3 basepython = python3
deps = -r{toxinidir}/requirements.txt deps =
-c {env:TEST_CONSTRAINTS_FILE:https://raw.githubusercontent.com/openstack-charmers/zaza-openstack-tests/master/constraints/constraints-2024.1.txt}
-r{toxinidir}/requirements.txt
-r{toxinidir}/test-requirements.txt -r{toxinidir}/test-requirements.txt
setenv = setenv =
{[testenv]setenv} {[testenv]setenv}