Add 2023.2 Bobcat support
* 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 * update build-on and run-on bases * drop kinetic Depends-On: https://review.opendev.org/c/openstack/charm-nova-cloud-controller/+/895840 Change-Id: I9c8c456fae377cf5330c6fbeef86e4fec47e473b
This commit is contained in:
parent
32e0a1fbdf
commit
a008114a9c
|
@ -30,51 +30,91 @@ bases:
|
||||||
- name: ubuntu
|
- name: ubuntu
|
||||||
channel: "22.04"
|
channel: "22.04"
|
||||||
architectures: [amd64]
|
architectures: [amd64]
|
||||||
|
- build-on:
|
||||||
- name: ubuntu
|
- name: ubuntu
|
||||||
channel: "22.10"
|
channel: "22.04"
|
||||||
|
architectures: [s390x]
|
||||||
|
run-on:
|
||||||
|
- name: ubuntu
|
||||||
|
channel: "22.04"
|
||||||
|
architectures: [s390x]
|
||||||
|
- build-on:
|
||||||
|
- name: ubuntu
|
||||||
|
channel: "22.04"
|
||||||
|
architectures: [ppc64el]
|
||||||
|
run-on:
|
||||||
|
- name: ubuntu
|
||||||
|
channel: "22.04"
|
||||||
|
architectures: [ppc64el]
|
||||||
|
- build-on:
|
||||||
|
- name: ubuntu
|
||||||
|
channel: "22.04"
|
||||||
|
architectures: [arm64]
|
||||||
|
run-on:
|
||||||
|
- name: ubuntu
|
||||||
|
channel: "22.04"
|
||||||
|
architectures: [arm64]
|
||||||
|
- build-on:
|
||||||
|
- name: ubuntu
|
||||||
|
channel: "23.04"
|
||||||
architectures: [amd64]
|
architectures: [amd64]
|
||||||
|
run-on:
|
||||||
- name: ubuntu
|
- name: ubuntu
|
||||||
channel: "23.04"
|
channel: "23.04"
|
||||||
architectures: [amd64]
|
architectures: [amd64]
|
||||||
- build-on:
|
- build-on:
|
||||||
- name: ubuntu
|
- name: ubuntu
|
||||||
channel: "22.04"
|
channel: "23.04"
|
||||||
architectures: [arm64]
|
architectures: [s390x]
|
||||||
run-on:
|
run-on:
|
||||||
- name: ubuntu
|
|
||||||
channel: "22.04"
|
|
||||||
architectures: [arm64]
|
|
||||||
- name: ubuntu
|
|
||||||
channel: "22.10"
|
|
||||||
architectures: [arm64]
|
|
||||||
- name: ubuntu
|
- name: ubuntu
|
||||||
channel: "23.04"
|
channel: "23.04"
|
||||||
architectures: [arm64]
|
architectures: [s390x]
|
||||||
- build-on:
|
- build-on:
|
||||||
- name: ubuntu
|
- name: ubuntu
|
||||||
channel: "22.04"
|
channel: "23.04"
|
||||||
architectures: [ppc64el]
|
architectures: [ppc64el]
|
||||||
run-on:
|
run-on:
|
||||||
- name: ubuntu
|
|
||||||
channel: "22.04"
|
|
||||||
architectures: [ppc64el]
|
|
||||||
- name: ubuntu
|
|
||||||
channel: "22.10"
|
|
||||||
architectures: [ppc64el]
|
|
||||||
- name: ubuntu
|
- name: ubuntu
|
||||||
channel: "23.04"
|
channel: "23.04"
|
||||||
architectures: [ppc64el]
|
architectures: [ppc64el]
|
||||||
- build-on:
|
- build-on:
|
||||||
- name: ubuntu
|
- name: ubuntu
|
||||||
channel: "22.04"
|
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]
|
architectures: [s390x]
|
||||||
run-on:
|
run-on:
|
||||||
- name: ubuntu
|
- name: ubuntu
|
||||||
channel: "22.04"
|
channel: "23.10"
|
||||||
architectures: [s390x]
|
architectures: [s390x]
|
||||||
|
- build-on:
|
||||||
- name: ubuntu
|
- name: ubuntu
|
||||||
channel: "22.10"
|
channel: "23.10"
|
||||||
architectures: [s390x]
|
architectures: [ppc64el]
|
||||||
|
run-on:
|
||||||
- name: ubuntu
|
- name: ubuntu
|
||||||
channel: "23.04"
|
channel: "23.10"
|
||||||
architectures: [s390x]
|
architectures: [ppc64el]
|
||||||
|
- build-on:
|
||||||
|
- name: ubuntu
|
||||||
|
channel: "23.10"
|
||||||
|
architectures: [arm64]
|
||||||
|
run-on:
|
||||||
|
- name: ubuntu
|
||||||
|
channel: "23.10"
|
||||||
|
architectures: [arm64]
|
||||||
|
|
10
osci.yaml
10
osci.yaml
|
@ -3,9 +3,10 @@
|
||||||
- charm-unit-jobs-py310
|
- charm-unit-jobs-py310
|
||||||
check:
|
check:
|
||||||
jobs:
|
jobs:
|
||||||
- jammy-zed
|
|
||||||
- jammy-antelope
|
- jammy-antelope
|
||||||
- jammy-antelope-ovn
|
- jammy-antelope-ovn
|
||||||
|
- jammy-bobcat
|
||||||
|
- jammy-bobcat-ovn
|
||||||
- lunar-antelope:
|
- lunar-antelope:
|
||||||
voting: false
|
voting: false
|
||||||
- lunar-antelope-ovn:
|
- lunar-antelope-ovn:
|
||||||
|
@ -14,7 +15,7 @@
|
||||||
needs_charm_build: true
|
needs_charm_build: true
|
||||||
charm_build_name: neutron-dynamic-routing
|
charm_build_name: neutron-dynamic-routing
|
||||||
build_type: charmcraft
|
build_type: charmcraft
|
||||||
charmcraft_channel: 2.1/stable
|
charmcraft_channel: 2.x/stable
|
||||||
|
|
||||||
- job:
|
- job:
|
||||||
name: jammy-antelope-ovn
|
name: jammy-antelope-ovn
|
||||||
|
@ -27,3 +28,8 @@
|
||||||
vars:
|
vars:
|
||||||
juju_snap_channel: "3.2/stable"
|
juju_snap_channel: "3.2/stable"
|
||||||
tox_extra_args: '-- lunar-antelope-ovn'
|
tox_extra_args: '-- lunar-antelope-ovn'
|
||||||
|
- job:
|
||||||
|
name: jammy-bobcat-ovn
|
||||||
|
parent: func-target
|
||||||
|
vars:
|
||||||
|
tox_extra_args: '-- jammy-bobcat-ovn'
|
||||||
|
|
|
@ -8,8 +8,8 @@ tags:
|
||||||
- openstack
|
- openstack
|
||||||
series:
|
series:
|
||||||
- jammy
|
- jammy
|
||||||
- kinetic
|
|
||||||
- lunar
|
- 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
|
||||||
|
|
|
@ -82,7 +82,7 @@ applications:
|
||||||
channel: latest/edge
|
channel: latest/edge
|
||||||
|
|
||||||
neutron-dynamic-routing:
|
neutron-dynamic-routing:
|
||||||
charm: ../../../neutron-dynamic-routing_ubuntu-22.04-amd64_ubuntu-22.10-amd64_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
|
||||||
|
@ -267,4 +267,4 @@ relations:
|
||||||
- nova-cloud-controller:certificates
|
- nova-cloud-controller:certificates
|
||||||
|
|
||||||
- - vault:certificates
|
- - vault:certificates
|
||||||
- placement:certificates
|
- placement:certificates
|
||||||
|
|
|
@ -83,7 +83,7 @@ applications:
|
||||||
channel: latest/edge
|
channel: latest/edge
|
||||||
|
|
||||||
neutron-dynamic-routing:
|
neutron-dynamic-routing:
|
||||||
charm: ../../../neutron-dynamic-routing_ubuntu-22.04-amd64_ubuntu-22.10-amd64_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
|
||||||
|
@ -245,4 +245,4 @@ relations:
|
||||||
- - neutron-api:neutron-plugin-api
|
- - neutron-api:neutron-plugin-api
|
||||||
- neutron-openvswitch:neutron-plugin-api
|
- neutron-openvswitch:neutron-plugin-api
|
||||||
- - neutron-openvswitch:neutron-plugin
|
- - neutron-openvswitch:neutron-plugin
|
||||||
- nova-compute:neutron-plugin
|
- nova-compute:neutron-plugin
|
||||||
|
|
|
@ -0,0 +1,270 @@
|
||||||
|
local_overlay_enabled: False
|
||||||
|
|
||||||
|
variables:
|
||||||
|
openstack-origin: &openstack-origin cloud:jammy-bobcat
|
||||||
|
|
||||||
|
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
|
|
@ -1,7 +1,7 @@
|
||||||
local_overlay_enabled: False
|
local_overlay_enabled: False
|
||||||
|
|
||||||
variables:
|
variables:
|
||||||
openstack-origin: &openstack-origin cloud:jammy-zed
|
openstack-origin: &openstack-origin cloud:jammy-bobcat
|
||||||
|
|
||||||
series: jammy
|
series: jammy
|
||||||
|
|
||||||
|
@ -83,7 +83,7 @@ applications:
|
||||||
channel: latest/edge
|
channel: latest/edge
|
||||||
|
|
||||||
neutron-dynamic-routing:
|
neutron-dynamic-routing:
|
||||||
charm: ../../../neutron-dynamic-routing_ubuntu-22.04-amd64_ubuntu-22.10-amd64_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
|
||||||
|
@ -245,4 +245,4 @@ relations:
|
||||||
- - neutron-api:neutron-plugin-api
|
- - neutron-api:neutron-plugin-api
|
||||||
- neutron-openvswitch:neutron-plugin-api
|
- neutron-openvswitch:neutron-plugin-api
|
||||||
- - neutron-openvswitch:neutron-plugin
|
- - neutron-openvswitch:neutron-plugin
|
||||||
- nova-compute:neutron-plugin
|
- nova-compute:neutron-plugin
|
|
@ -82,7 +82,7 @@ applications:
|
||||||
channel: latest/edge
|
channel: latest/edge
|
||||||
|
|
||||||
neutron-dynamic-routing:
|
neutron-dynamic-routing:
|
||||||
charm: ../../../neutron-dynamic-routing_ubuntu-22.04-amd64_ubuntu-22.10-amd64_ubuntu-23.04-amd64.charm
|
charm: ../../../neutron-dynamic-routing_ubuntu-23.04-amd64.charm
|
||||||
num_units: 1
|
num_units: 1
|
||||||
options:
|
options:
|
||||||
openstack-origin: *openstack-origin
|
openstack-origin: *openstack-origin
|
||||||
|
@ -267,4 +267,4 @@ relations:
|
||||||
- nova-cloud-controller:certificates
|
- nova-cloud-controller:certificates
|
||||||
|
|
||||||
- - vault:certificates
|
- - vault:certificates
|
||||||
- placement:certificates
|
- placement:certificates
|
||||||
|
|
|
@ -83,7 +83,7 @@ applications:
|
||||||
channel: latest/edge
|
channel: latest/edge
|
||||||
|
|
||||||
neutron-dynamic-routing:
|
neutron-dynamic-routing:
|
||||||
charm: ../../../neutron-dynamic-routing_ubuntu-22.04-amd64_ubuntu-22.10-amd64_ubuntu-23.04-amd64.charm
|
charm: ../../../neutron-dynamic-routing_ubuntu-23.04-amd64.charm
|
||||||
num_units: 1
|
num_units: 1
|
||||||
options:
|
options:
|
||||||
openstack-origin: *openstack-origin
|
openstack-origin: *openstack-origin
|
||||||
|
@ -245,4 +245,4 @@ relations:
|
||||||
- - neutron-api:neutron-plugin-api
|
- - neutron-api:neutron-plugin-api
|
||||||
- neutron-openvswitch:neutron-plugin-api
|
- neutron-openvswitch:neutron-plugin-api
|
||||||
- - neutron-openvswitch:neutron-plugin
|
- - neutron-openvswitch:neutron-plugin
|
||||||
- nova-compute:neutron-plugin
|
- nova-compute:neutron-plugin
|
||||||
|
|
|
@ -0,0 +1,270 @@
|
||||||
|
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
|
|
@ -0,0 +1,248 @@
|
||||||
|
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
|
|
@ -8,20 +8,21 @@ configure:
|
||||||
- zaza.openstack.charm_tests.dragent.configure.setup
|
- zaza.openstack.charm_tests.dragent.configure.setup
|
||||||
|
|
||||||
gate_bundles:
|
gate_bundles:
|
||||||
- jammy-zed
|
|
||||||
|
|
||||||
smoke_bundles:
|
|
||||||
- jammy-zed
|
|
||||||
|
|
||||||
dev_bundles:
|
|
||||||
# There is no jammy-zed-ovn bundle as neutron-dynamic-routing
|
|
||||||
# compatibility with ML2/ovn has only been declared in Neutron
|
|
||||||
# 22.0.0 which is used in 2023.1 (Antelope)
|
|
||||||
- jammy-zed
|
|
||||||
- jammy-antelope
|
- jammy-antelope
|
||||||
- jammy-antelope-ovn
|
- jammy-antelope-ovn
|
||||||
|
|
||||||
|
smoke_bundles:
|
||||||
|
- jammy-antelope-ovn
|
||||||
|
|
||||||
|
dev_bundles:
|
||||||
|
- jammy-antelope
|
||||||
|
- jammy-antelope-ovn
|
||||||
|
- jammy-bobcat
|
||||||
|
- jammy-bobcat-ovn
|
||||||
- lunar-antelope
|
- lunar-antelope
|
||||||
- lunar-antelope-ovn
|
- lunar-antelope-ovn
|
||||||
|
- mantic-bobcat
|
||||||
|
- mantic-bobcat-ovn
|
||||||
|
|
||||||
target_deploy_status:
|
target_deploy_status:
|
||||||
neutron-api-plugin-ovn:
|
neutron-api-plugin-ovn:
|
||||||
|
|
Loading…
Reference in New Issue