Add charmcraft 3 support
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 - Add noble/oracular to charmhelpers - Drop non-noble tests Change-Id: I8547542c4e328b5bd60cf27462ff7cb6b13128ca
This commit is contained in:
Billy Olsen
Billy Olsen
parent
bb951b7f61
commit
5eaf86557a
@ -4,29 +4,18 @@ parts:
|
|||||||
charm:
|
charm:
|
||||||
plugin: dump
|
plugin: dump
|
||||||
source: .
|
source: .
|
||||||
prime:
|
|
||||||
- actions/*
|
|
||||||
- files/*
|
|
||||||
- hooks/*
|
|
||||||
- lib/*
|
|
||||||
- templates/*
|
|
||||||
- actions.yaml
|
|
||||||
- config.yaml
|
|
||||||
- copyright
|
|
||||||
- hardening.yaml
|
|
||||||
- icon.svg
|
|
||||||
- LICENSE
|
|
||||||
- Makefile
|
|
||||||
- metadata.yaml
|
|
||||||
- README.md
|
|
||||||
|
|
||||||
bases:
|
base: ubuntu@24.04
|
||||||
- build-on:
|
platforms:
|
||||||
- name: ubuntu
|
amd64:
|
||||||
channel: "22.04"
|
build-on: amd64
|
||||||
architectures:
|
build-for: amd64
|
||||||
- amd64
|
arm64:
|
||||||
run-on:
|
build-on: arm64
|
||||||
- name: ubuntu
|
build-for: arm64
|
||||||
channel: "22.04"
|
ppc64el:
|
||||||
architectures: [amd64, s390x, ppc64el, arm64]
|
build-on: ppc64el
|
||||||
|
build-for: ppc64el
|
||||||
|
s390x:
|
||||||
|
build-on: s390x
|
||||||
|
build-for: s390x
|
||||||
|
|||||||
@ -14,7 +14,7 @@ options:
|
|||||||
Setting this to True will allow supporting services to log to syslog.
|
Setting this to True will allow supporting services to log to syslog.
|
||||||
openstack-origin:
|
openstack-origin:
|
||||||
type: string
|
type: string
|
||||||
default: bobcat
|
default: caracal
|
||||||
description: |
|
description: |
|
||||||
Repository from which to install. May be one of the following:
|
Repository from which to install. May be one of the following:
|
||||||
distro (default), ppa:somecustom/ppa, a deb url sources entry,
|
distro (default), ppa:somecustom/ppa, a deb url sources entry,
|
||||||
|
|||||||
@ -33,6 +33,8 @@ UBUNTU_RELEASES = (
|
|||||||
'kinetic',
|
'kinetic',
|
||||||
'lunar',
|
'lunar',
|
||||||
'mantic',
|
'mantic',
|
||||||
|
'noble',
|
||||||
|
'oracular',
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@ -6,4 +6,4 @@
|
|||||||
needs_charm_build: true
|
needs_charm_build: true
|
||||||
charm_build_name: neutron-gateway
|
charm_build_name: neutron-gateway
|
||||||
build_type: charmcraft
|
build_type: charmcraft
|
||||||
charmcraft_channel: 2.x/stable
|
charmcraft_channel: 3.x/beta
|
||||||
|
|||||||
@ -1,287 +0,0 @@
|
|||||||
variables:
|
|
||||||
openstack-origin: &openstack-origin cloud:jammy-antelope
|
|
||||||
|
|
||||||
series: &series jammy
|
|
||||||
|
|
||||||
machines:
|
|
||||||
0:
|
|
||||||
constraints: "mem=3072M"
|
|
||||||
1:
|
|
||||||
constraints: "mem=3072M"
|
|
||||||
2:
|
|
||||||
constraints: "mem=3072M"
|
|
||||||
3: {}
|
|
||||||
4: {}
|
|
||||||
5: {}
|
|
||||||
6: {}
|
|
||||||
7: {}
|
|
||||||
8:
|
|
||||||
constraints: "mem=4G"
|
|
||||||
9:
|
|
||||||
constraints: "root-disk=20G mem=4G"
|
|
||||||
10:
|
|
||||||
constraints: "root-disk=20G mem=4G"
|
|
||||||
11: {}
|
|
||||||
12: {}
|
|
||||||
13: {}
|
|
||||||
|
|
||||||
# We specify machine placements for these to improve iteration
|
|
||||||
# time, given that machine "0" comes up way before machine "7"
|
|
||||||
applications:
|
|
||||||
|
|
||||||
neutron-api-mysql-router:
|
|
||||||
charm: ch:mysql-router
|
|
||||||
channel: latest/edge
|
|
||||||
keystone-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
|
|
||||||
to:
|
|
||||||
- '0'
|
|
||||||
- '1'
|
|
||||||
- '2'
|
|
||||||
channel: latest/edge
|
|
||||||
|
|
||||||
rabbitmq-server:
|
|
||||||
charm: ch:rabbitmq-server
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
to:
|
|
||||||
- '3'
|
|
||||||
channel: latest/edge
|
|
||||||
|
|
||||||
neutron-api:
|
|
||||||
charm: ch:neutron-api
|
|
||||||
series: *series
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
manage-neutron-plugin-legacy-mode: true
|
|
||||||
flat-network-providers: physnet1
|
|
||||||
neutron-security-groups: true
|
|
||||||
openstack-origin: *openstack-origin
|
|
||||||
enable-qos: true
|
|
||||||
to:
|
|
||||||
- '4'
|
|
||||||
channel: 2024.1/edge
|
|
||||||
|
|
||||||
keystone:
|
|
||||||
charm: ch:keystone
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
openstack-origin: *openstack-origin
|
|
||||||
to:
|
|
||||||
- '5'
|
|
||||||
channel: 2024.1/edge
|
|
||||||
|
|
||||||
glance:
|
|
||||||
charm: ch:glance
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
openstack-origin: *openstack-origin
|
|
||||||
to:
|
|
||||||
- '6'
|
|
||||||
channel: 2024.1/edge
|
|
||||||
|
|
||||||
neutron-openvswitch:
|
|
||||||
charm: ch:neutron-openvswitch
|
|
||||||
channel: 2024.1/edge
|
|
||||||
neutron-gateway:
|
|
||||||
charm: ../../neutron-gateway.charm
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
bridge-mappings: physnet1:br-ex
|
|
||||||
openstack-origin: *openstack-origin
|
|
||||||
to:
|
|
||||||
- '7'
|
|
||||||
|
|
||||||
ovn-dedicated-chassis:
|
|
||||||
charm: ch:ovn-dedicated-chassis
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
# start new units paused to allow unit by unit OVS to OVN migration
|
|
||||||
new-units-paused: true
|
|
||||||
to:
|
|
||||||
# NOTE: We deliberately colocate the ovn-dedicated-chassis with the
|
|
||||||
# neutron-gateway for migration test purposes.
|
|
||||||
- '7'
|
|
||||||
channel: latest/edge
|
|
||||||
|
|
||||||
nova-cloud-controller:
|
|
||||||
charm: ch:nova-cloud-controller
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
network-manager: Neutron
|
|
||||||
openstack-origin: *openstack-origin
|
|
||||||
to:
|
|
||||||
- '8'
|
|
||||||
channel: 2024.1/edge
|
|
||||||
|
|
||||||
nova-compute:
|
|
||||||
charm: ch:nova-compute
|
|
||||||
num_units: 2
|
|
||||||
options:
|
|
||||||
openstack-origin: *openstack-origin
|
|
||||||
to:
|
|
||||||
- '9'
|
|
||||||
- '10'
|
|
||||||
channel: 2024.1/edge
|
|
||||||
|
|
||||||
placement:
|
|
||||||
charm: ch:placement
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
openstack-origin: *openstack-origin
|
|
||||||
to:
|
|
||||||
- '11'
|
|
||||||
channel: 2024.1/edge
|
|
||||||
|
|
||||||
vault-mysql-router:
|
|
||||||
charm: ch:mysql-router
|
|
||||||
channel: latest/edge
|
|
||||||
vault:
|
|
||||||
charm: ch:vault
|
|
||||||
num_units: 1
|
|
||||||
to:
|
|
||||||
- '12'
|
|
||||||
channel: latest/edge
|
|
||||||
ovn-central:
|
|
||||||
charm: ch:ovn-central
|
|
||||||
num_units: 3
|
|
||||||
options:
|
|
||||||
source: *openstack-origin
|
|
||||||
to:
|
|
||||||
- '13'
|
|
||||||
channel: latest/edge
|
|
||||||
neutron-api-plugin-ovn:
|
|
||||||
charm: ch:neutron-api-plugin-ovn
|
|
||||||
channel: 2024.1/edge
|
|
||||||
ovn-chassis:
|
|
||||||
charm: ch:ovn-chassis
|
|
||||||
options:
|
|
||||||
# start new units paused to allow unit by unit OVS to OVN migration
|
|
||||||
new-units-paused: true
|
|
||||||
channel: latest/edge
|
|
||||||
|
|
||||||
relations:
|
|
||||||
|
|
||||||
- - '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'
|
|
||||||
|
|
||||||
- - 'keystone:shared-db'
|
|
||||||
- 'keystone-mysql-router:shared-db'
|
|
||||||
- - 'keystone-mysql-router:db-router'
|
|
||||||
- 'mysql-innodb-cluster:db-router'
|
|
||||||
|
|
||||||
- - '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'
|
|
||||||
|
|
||||||
- - 'neutron-openvswitch:neutron-plugin-api'
|
|
||||||
- 'neutron-api:neutron-plugin-api'
|
|
||||||
|
|
||||||
- - '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: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'
|
|
||||||
|
|
||||||
# We need to defer the addition of the neutron-api-plugin-ovn subordinate
|
|
||||||
# relation to the functional test as the test will first validate the legacy
|
|
||||||
# Neutron ML2+OVS topology, migrate it to OVN and then confirm connectivity
|
|
||||||
# post migration.
|
|
||||||
#
|
|
||||||
# - - neutron-api-plugin-ovn:neutron-plugin
|
|
||||||
# - neutron-api:neutron-plugin-api-subordinate
|
|
||||||
- - ovn-central:certificates
|
|
||||||
- vault:certificates
|
|
||||||
- - ovn-central:ovsdb-cms
|
|
||||||
- neutron-api-plugin-ovn:ovsdb-cms
|
|
||||||
- - ovn-chassis:nova-compute
|
|
||||||
- nova-compute:neutron-plugin
|
|
||||||
- - ovn-chassis:certificates
|
|
||||||
- vault:certificates
|
|
||||||
- - ovn-chassis:ovsdb
|
|
||||||
- ovn-central:ovsdb
|
|
||||||
- - ovn-dedicated-chassis:certificates
|
|
||||||
- vault:certificates
|
|
||||||
- - ovn-dedicated-chassis:ovsdb
|
|
||||||
- ovn-central:ovsdb
|
|
||||||
- - vault:certificates
|
|
||||||
- neutron-api-plugin-ovn:certificates
|
|
||||||
- - vault:shared-db
|
|
||||||
- vault-mysql-router:shared-db
|
|
||||||
- - vault-mysql-router:db-router
|
|
||||||
- mysql-innodb-cluster:db-router
|
|
||||||
@ -1,287 +0,0 @@
|
|||||||
variables:
|
|
||||||
openstack-origin: &openstack-origin cloud:jammy-bobcat
|
|
||||||
|
|
||||||
series: &series jammy
|
|
||||||
|
|
||||||
machines:
|
|
||||||
0:
|
|
||||||
constraints: "mem=3072M"
|
|
||||||
1:
|
|
||||||
constraints: "mem=3072M"
|
|
||||||
2:
|
|
||||||
constraints: "mem=3072M"
|
|
||||||
3: {}
|
|
||||||
4: {}
|
|
||||||
5: {}
|
|
||||||
6: {}
|
|
||||||
7: {}
|
|
||||||
8:
|
|
||||||
constraints: "mem=4G"
|
|
||||||
9:
|
|
||||||
constraints: "root-disk=20G mem=4G"
|
|
||||||
10:
|
|
||||||
constraints: "root-disk=20G mem=4G"
|
|
||||||
11: {}
|
|
||||||
12: {}
|
|
||||||
13: {}
|
|
||||||
|
|
||||||
# We specify machine placements for these to improve iteration
|
|
||||||
# time, given that machine "0" comes up way before machine "7"
|
|
||||||
applications:
|
|
||||||
|
|
||||||
neutron-api-mysql-router:
|
|
||||||
charm: ch:mysql-router
|
|
||||||
channel: latest/edge
|
|
||||||
keystone-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
|
|
||||||
to:
|
|
||||||
- '0'
|
|
||||||
- '1'
|
|
||||||
- '2'
|
|
||||||
channel: latest/edge
|
|
||||||
|
|
||||||
rabbitmq-server:
|
|
||||||
charm: ch:rabbitmq-server
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
to:
|
|
||||||
- '3'
|
|
||||||
channel: latest/edge
|
|
||||||
|
|
||||||
neutron-api:
|
|
||||||
charm: ch:neutron-api
|
|
||||||
series: *series
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
manage-neutron-plugin-legacy-mode: true
|
|
||||||
flat-network-providers: physnet1
|
|
||||||
neutron-security-groups: true
|
|
||||||
openstack-origin: *openstack-origin
|
|
||||||
enable-qos: true
|
|
||||||
to:
|
|
||||||
- '4'
|
|
||||||
channel: 2024.1/edge
|
|
||||||
|
|
||||||
keystone:
|
|
||||||
charm: ch:keystone
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
openstack-origin: *openstack-origin
|
|
||||||
to:
|
|
||||||
- '5'
|
|
||||||
channel: 2024.1/edge
|
|
||||||
|
|
||||||
glance:
|
|
||||||
charm: ch:glance
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
openstack-origin: *openstack-origin
|
|
||||||
to:
|
|
||||||
- '6'
|
|
||||||
channel: 2024.1/edge
|
|
||||||
|
|
||||||
neutron-openvswitch:
|
|
||||||
charm: ch:neutron-openvswitch
|
|
||||||
channel: 2024.1/edge
|
|
||||||
neutron-gateway:
|
|
||||||
charm: ../../neutron-gateway.charm
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
bridge-mappings: physnet1:br-ex
|
|
||||||
openstack-origin: *openstack-origin
|
|
||||||
to:
|
|
||||||
- '7'
|
|
||||||
|
|
||||||
ovn-dedicated-chassis:
|
|
||||||
charm: ch:ovn-dedicated-chassis
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
# start new units paused to allow unit by unit OVS to OVN migration
|
|
||||||
new-units-paused: true
|
|
||||||
to:
|
|
||||||
# NOTE: We deliberately colocate the ovn-dedicated-chassis with the
|
|
||||||
# neutron-gateway for migration test purposes.
|
|
||||||
- '7'
|
|
||||||
channel: latest/edge
|
|
||||||
|
|
||||||
nova-cloud-controller:
|
|
||||||
charm: ch:nova-cloud-controller
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
network-manager: Neutron
|
|
||||||
openstack-origin: *openstack-origin
|
|
||||||
to:
|
|
||||||
- '8'
|
|
||||||
channel: 2024.1/edge
|
|
||||||
|
|
||||||
nova-compute:
|
|
||||||
charm: ch:nova-compute
|
|
||||||
num_units: 2
|
|
||||||
options:
|
|
||||||
openstack-origin: *openstack-origin
|
|
||||||
to:
|
|
||||||
- '9'
|
|
||||||
- '10'
|
|
||||||
channel: 2024.1/edge
|
|
||||||
|
|
||||||
placement:
|
|
||||||
charm: ch:placement
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
openstack-origin: *openstack-origin
|
|
||||||
to:
|
|
||||||
- '11'
|
|
||||||
channel: 2024.1/edge
|
|
||||||
|
|
||||||
vault-mysql-router:
|
|
||||||
charm: ch:mysql-router
|
|
||||||
channel: latest/edge
|
|
||||||
vault:
|
|
||||||
charm: ch:vault
|
|
||||||
num_units: 1
|
|
||||||
to:
|
|
||||||
- '12'
|
|
||||||
channel: latest/edge
|
|
||||||
ovn-central:
|
|
||||||
charm: ch:ovn-central
|
|
||||||
num_units: 3
|
|
||||||
options:
|
|
||||||
source: *openstack-origin
|
|
||||||
to:
|
|
||||||
- '13'
|
|
||||||
channel: latest/edge
|
|
||||||
neutron-api-plugin-ovn:
|
|
||||||
charm: ch:neutron-api-plugin-ovn
|
|
||||||
channel: 2024.1/edge
|
|
||||||
ovn-chassis:
|
|
||||||
charm: ch:ovn-chassis
|
|
||||||
options:
|
|
||||||
# start new units paused to allow unit by unit OVS to OVN migration
|
|
||||||
new-units-paused: true
|
|
||||||
channel: latest/edge
|
|
||||||
|
|
||||||
relations:
|
|
||||||
|
|
||||||
- - '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'
|
|
||||||
|
|
||||||
- - 'keystone:shared-db'
|
|
||||||
- 'keystone-mysql-router:shared-db'
|
|
||||||
- - 'keystone-mysql-router:db-router'
|
|
||||||
- 'mysql-innodb-cluster:db-router'
|
|
||||||
|
|
||||||
- - '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'
|
|
||||||
|
|
||||||
- - 'neutron-openvswitch:neutron-plugin-api'
|
|
||||||
- 'neutron-api:neutron-plugin-api'
|
|
||||||
|
|
||||||
- - '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: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'
|
|
||||||
|
|
||||||
# We need to defer the addition of the neutron-api-plugin-ovn subordinate
|
|
||||||
# relation to the functional test as the test will first validate the legacy
|
|
||||||
# Neutron ML2+OVS topology, migrate it to OVN and then confirm connectivity
|
|
||||||
# post migration.
|
|
||||||
#
|
|
||||||
# - - neutron-api-plugin-ovn:neutron-plugin
|
|
||||||
# - neutron-api:neutron-plugin-api-subordinate
|
|
||||||
- - ovn-central:certificates
|
|
||||||
- vault:certificates
|
|
||||||
- - ovn-central:ovsdb-cms
|
|
||||||
- neutron-api-plugin-ovn:ovsdb-cms
|
|
||||||
- - ovn-chassis:nova-compute
|
|
||||||
- nova-compute:neutron-plugin
|
|
||||||
- - ovn-chassis:certificates
|
|
||||||
- vault:certificates
|
|
||||||
- - ovn-chassis:ovsdb
|
|
||||||
- ovn-central:ovsdb
|
|
||||||
- - ovn-dedicated-chassis:certificates
|
|
||||||
- vault:certificates
|
|
||||||
- - ovn-dedicated-chassis:ovsdb
|
|
||||||
- ovn-central:ovsdb
|
|
||||||
- - vault:certificates
|
|
||||||
- neutron-api-plugin-ovn:certificates
|
|
||||||
- - vault:shared-db
|
|
||||||
- vault-mysql-router:shared-db
|
|
||||||
- - vault-mysql-router:db-router
|
|
||||||
- mysql-innodb-cluster:db-router
|
|
||||||
@ -1,287 +0,0 @@
|
|||||||
variables:
|
|
||||||
openstack-origin: &openstack-origin cloud:jammy-caracal
|
|
||||||
|
|
||||||
series: &series jammy
|
|
||||||
|
|
||||||
machines:
|
|
||||||
0:
|
|
||||||
constraints: "mem=3072M"
|
|
||||||
1:
|
|
||||||
constraints: "mem=3072M"
|
|
||||||
2:
|
|
||||||
constraints: "mem=3072M"
|
|
||||||
3: {}
|
|
||||||
4: {}
|
|
||||||
5: {}
|
|
||||||
6: {}
|
|
||||||
7: {}
|
|
||||||
8:
|
|
||||||
constraints: "mem=4G"
|
|
||||||
9:
|
|
||||||
constraints: "root-disk=20G mem=4G"
|
|
||||||
10:
|
|
||||||
constraints: "root-disk=20G mem=4G"
|
|
||||||
11: {}
|
|
||||||
12: {}
|
|
||||||
13: {}
|
|
||||||
|
|
||||||
# We specify machine placements for these to improve iteration
|
|
||||||
# time, given that machine "0" comes up way before machine "7"
|
|
||||||
applications:
|
|
||||||
|
|
||||||
neutron-api-mysql-router:
|
|
||||||
charm: ch:mysql-router
|
|
||||||
channel: latest/edge
|
|
||||||
keystone-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
|
|
||||||
to:
|
|
||||||
- '0'
|
|
||||||
- '1'
|
|
||||||
- '2'
|
|
||||||
channel: latest/edge
|
|
||||||
|
|
||||||
rabbitmq-server:
|
|
||||||
charm: ch:rabbitmq-server
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
to:
|
|
||||||
- '3'
|
|
||||||
channel: latest/edge
|
|
||||||
|
|
||||||
neutron-api:
|
|
||||||
charm: ch:neutron-api
|
|
||||||
series: *series
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
manage-neutron-plugin-legacy-mode: true
|
|
||||||
flat-network-providers: physnet1
|
|
||||||
neutron-security-groups: true
|
|
||||||
openstack-origin: *openstack-origin
|
|
||||||
enable-qos: true
|
|
||||||
to:
|
|
||||||
- '4'
|
|
||||||
channel: 2024.1/edge
|
|
||||||
|
|
||||||
keystone:
|
|
||||||
charm: ch:keystone
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
openstack-origin: *openstack-origin
|
|
||||||
to:
|
|
||||||
- '5'
|
|
||||||
channel: 2024.1/edge
|
|
||||||
|
|
||||||
glance:
|
|
||||||
charm: ch:glance
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
openstack-origin: *openstack-origin
|
|
||||||
to:
|
|
||||||
- '6'
|
|
||||||
channel: 2024.1/edge
|
|
||||||
|
|
||||||
neutron-openvswitch:
|
|
||||||
charm: ch:neutron-openvswitch
|
|
||||||
channel: 2024.1/edge
|
|
||||||
neutron-gateway:
|
|
||||||
charm: ../../neutron-gateway.charm
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
bridge-mappings: physnet1:br-ex
|
|
||||||
openstack-origin: *openstack-origin
|
|
||||||
to:
|
|
||||||
- '7'
|
|
||||||
|
|
||||||
ovn-dedicated-chassis:
|
|
||||||
charm: ch:ovn-dedicated-chassis
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
# start new units paused to allow unit by unit OVS to OVN migration
|
|
||||||
new-units-paused: true
|
|
||||||
to:
|
|
||||||
# NOTE: We deliberately colocate the ovn-dedicated-chassis with the
|
|
||||||
# neutron-gateway for migration test purposes.
|
|
||||||
- '7'
|
|
||||||
channel: latest/edge
|
|
||||||
|
|
||||||
nova-cloud-controller:
|
|
||||||
charm: ch:nova-cloud-controller
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
network-manager: Neutron
|
|
||||||
openstack-origin: *openstack-origin
|
|
||||||
to:
|
|
||||||
- '8'
|
|
||||||
channel: 2024.1/edge
|
|
||||||
|
|
||||||
nova-compute:
|
|
||||||
charm: ch:nova-compute
|
|
||||||
num_units: 2
|
|
||||||
options:
|
|
||||||
openstack-origin: *openstack-origin
|
|
||||||
to:
|
|
||||||
- '9'
|
|
||||||
- '10'
|
|
||||||
channel: 2024.1/edge
|
|
||||||
|
|
||||||
placement:
|
|
||||||
charm: ch:placement
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
openstack-origin: *openstack-origin
|
|
||||||
to:
|
|
||||||
- '11'
|
|
||||||
channel: 2024.1/edge
|
|
||||||
|
|
||||||
vault-mysql-router:
|
|
||||||
charm: ch:mysql-router
|
|
||||||
channel: latest/edge
|
|
||||||
vault:
|
|
||||||
charm: ch:vault
|
|
||||||
num_units: 1
|
|
||||||
to:
|
|
||||||
- '12'
|
|
||||||
channel: latest/edge
|
|
||||||
ovn-central:
|
|
||||||
charm: ch:ovn-central
|
|
||||||
num_units: 3
|
|
||||||
options:
|
|
||||||
source: *openstack-origin
|
|
||||||
to:
|
|
||||||
- '13'
|
|
||||||
channel: latest/edge
|
|
||||||
neutron-api-plugin-ovn:
|
|
||||||
charm: ch:neutron-api-plugin-ovn
|
|
||||||
channel: 2024.1/edge
|
|
||||||
ovn-chassis:
|
|
||||||
charm: ch:ovn-chassis
|
|
||||||
options:
|
|
||||||
# start new units paused to allow unit by unit OVS to OVN migration
|
|
||||||
new-units-paused: true
|
|
||||||
channel: latest/edge
|
|
||||||
|
|
||||||
relations:
|
|
||||||
|
|
||||||
- - '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'
|
|
||||||
|
|
||||||
- - 'keystone:shared-db'
|
|
||||||
- 'keystone-mysql-router:shared-db'
|
|
||||||
- - 'keystone-mysql-router:db-router'
|
|
||||||
- 'mysql-innodb-cluster:db-router'
|
|
||||||
|
|
||||||
- - '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'
|
|
||||||
|
|
||||||
- - 'neutron-openvswitch:neutron-plugin-api'
|
|
||||||
- 'neutron-api:neutron-plugin-api'
|
|
||||||
|
|
||||||
- - '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: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'
|
|
||||||
|
|
||||||
# We need to defer the addition of the neutron-api-plugin-ovn subordinate
|
|
||||||
# relation to the functional test as the test will first validate the legacy
|
|
||||||
# Neutron ML2+OVS topology, migrate it to OVN and then confirm connectivity
|
|
||||||
# post migration.
|
|
||||||
#
|
|
||||||
# - - neutron-api-plugin-ovn:neutron-plugin
|
|
||||||
# - neutron-api:neutron-plugin-api-subordinate
|
|
||||||
- - ovn-central:certificates
|
|
||||||
- vault:certificates
|
|
||||||
- - ovn-central:ovsdb-cms
|
|
||||||
- neutron-api-plugin-ovn:ovsdb-cms
|
|
||||||
- - ovn-chassis:nova-compute
|
|
||||||
- nova-compute:neutron-plugin
|
|
||||||
- - ovn-chassis:certificates
|
|
||||||
- vault:certificates
|
|
||||||
- - ovn-chassis:ovsdb
|
|
||||||
- ovn-central:ovsdb
|
|
||||||
- - ovn-dedicated-chassis:certificates
|
|
||||||
- vault:certificates
|
|
||||||
- - ovn-dedicated-chassis:ovsdb
|
|
||||||
- ovn-central:ovsdb
|
|
||||||
- - vault:certificates
|
|
||||||
- neutron-api-plugin-ovn:certificates
|
|
||||||
- - vault:shared-db
|
|
||||||
- vault-mysql-router:shared-db
|
|
||||||
- - vault-mysql-router:db-router
|
|
||||||
- mysql-innodb-cluster:db-router
|
|
||||||
@ -74,7 +74,7 @@ applications:
|
|||||||
enable-qos: true
|
enable-qos: true
|
||||||
to:
|
to:
|
||||||
- '4'
|
- '4'
|
||||||
channel: 2024.1/edge
|
channel: latest/edge
|
||||||
|
|
||||||
keystone:
|
keystone:
|
||||||
charm: ch:keystone
|
charm: ch:keystone
|
||||||
@ -83,7 +83,7 @@ applications:
|
|||||||
openstack-origin: *openstack-origin
|
openstack-origin: *openstack-origin
|
||||||
to:
|
to:
|
||||||
- '5'
|
- '5'
|
||||||
channel: 2024.1/edge
|
channel: latest/edge
|
||||||
|
|
||||||
glance:
|
glance:
|
||||||
charm: ch:glance
|
charm: ch:glance
|
||||||
@ -92,11 +92,11 @@ applications:
|
|||||||
openstack-origin: *openstack-origin
|
openstack-origin: *openstack-origin
|
||||||
to:
|
to:
|
||||||
- '6'
|
- '6'
|
||||||
channel: 2024.1/edge
|
channel: latest/edge
|
||||||
|
|
||||||
neutron-openvswitch:
|
neutron-openvswitch:
|
||||||
charm: ch:neutron-openvswitch
|
charm: ch:neutron-openvswitch
|
||||||
channel: 2024.1/edge
|
channel: latest/edge
|
||||||
neutron-gateway:
|
neutron-gateway:
|
||||||
charm: ../../neutron-gateway.charm
|
charm: ../../neutron-gateway.charm
|
||||||
num_units: 1
|
num_units: 1
|
||||||
@ -126,7 +126,7 @@ applications:
|
|||||||
openstack-origin: *openstack-origin
|
openstack-origin: *openstack-origin
|
||||||
to:
|
to:
|
||||||
- '8'
|
- '8'
|
||||||
channel: 2024.1/edge
|
channel: latest/edge
|
||||||
|
|
||||||
nova-compute:
|
nova-compute:
|
||||||
charm: ch:nova-compute
|
charm: ch:nova-compute
|
||||||
@ -136,7 +136,7 @@ applications:
|
|||||||
to:
|
to:
|
||||||
- '9'
|
- '9'
|
||||||
- '10'
|
- '10'
|
||||||
channel: 2024.1/edge
|
channel: latest/edge
|
||||||
|
|
||||||
placement:
|
placement:
|
||||||
charm: ch:placement
|
charm: ch:placement
|
||||||
@ -145,7 +145,7 @@ applications:
|
|||||||
openstack-origin: *openstack-origin
|
openstack-origin: *openstack-origin
|
||||||
to:
|
to:
|
||||||
- '11'
|
- '11'
|
||||||
channel: 2024.1/edge
|
channel: latest/edge
|
||||||
|
|
||||||
vault-mysql-router:
|
vault-mysql-router:
|
||||||
charm: ch:mysql-router
|
charm: ch:mysql-router
|
||||||
@ -166,7 +166,7 @@ applications:
|
|||||||
channel: latest/edge
|
channel: latest/edge
|
||||||
neutron-api-plugin-ovn:
|
neutron-api-plugin-ovn:
|
||||||
charm: ch:neutron-api-plugin-ovn
|
charm: ch:neutron-api-plugin-ovn
|
||||||
channel: 2024.1/edge
|
channel: latest/edge
|
||||||
ovn-chassis:
|
ovn-chassis:
|
||||||
charm: ch:ovn-chassis
|
charm: ch:ovn-chassis
|
||||||
options:
|
options:
|
||||||
|
|||||||
@ -6,11 +6,9 @@ charm_name: neutron-gateway
|
|||||||
# OVS to OVN.
|
# OVS to OVN.
|
||||||
#
|
#
|
||||||
smoke_bundles:
|
smoke_bundles:
|
||||||
- jammy-caracal
|
- noble-caracal
|
||||||
gate_bundles:
|
gate_bundles:
|
||||||
- jammy-antelope
|
- noble-caracal
|
||||||
- jammy-bobcat
|
|
||||||
- jammy-caracal
|
|
||||||
dev_bundles:
|
dev_bundles:
|
||||||
- noble-caracal
|
- noble-caracal
|
||||||
target_deploy_status:
|
target_deploy_status:
|
||||||
@ -76,5 +74,3 @@ tests_options:
|
|||||||
# reusing the instances created for the first run. This both saves time and
|
# reusing the instances created for the first run. This both saves time and
|
||||||
# allows verifying instances survive a SDN migration.
|
# allows verifying instances survive a SDN migration.
|
||||||
zaza.openstack.charm_tests.neutron.tests.NeutronNetworkingTest.test_instances_have_networking.run_resource_cleanup: false
|
zaza.openstack.charm_tests.neutron.tests.NeutronNetworkingTest.test_instances_have_networking.run_resource_cleanup: false
|
||||||
force_deploy:
|
|
||||||
- noble-caracal
|
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user