Add yoga bundles and release-tool syncs
* charm-helpers sync for classic charms * pin pyparsing for aodhclient * pin cffi for py35 * add non-voting focal-yoga bundle * add non-voting jammy-yoga bundle * add series metadata for jammy * switch xena bundles to voting * run focal-ussuri as smoke tests * remove groovy bundles Change-Id: Ia6693051e5a4aec8be6a4a464ef5f57a3143ec5a
This commit is contained in:
parent
5627cc9f7d
commit
e41a4daa80
|
@ -10,11 +10,12 @@
|
|||
- focal-ussuri
|
||||
- focal-victoria
|
||||
- focal-wallaby
|
||||
- focal-xena:
|
||||
- focal-xena
|
||||
- focal-yoga:
|
||||
voting: false
|
||||
- groovy-victoria
|
||||
- hirsute-wallaby
|
||||
- impish-xena:
|
||||
- impish-xena
|
||||
- jammy-yoga:
|
||||
voting: false
|
||||
vars:
|
||||
needs_charm_build: true
|
||||
|
|
|
@ -9,6 +9,7 @@
|
|||
setuptools<50.0.0 # https://github.com/pypa/setuptools/commit/04e3df22df840c6bb244e9b27bc56750c44b7c85
|
||||
|
||||
# Build requirements
|
||||
cffi==1.14.6; python_version < '3.6' # cffi 1.15.0 drops support for py35.
|
||||
charm-tools==2.8.3
|
||||
|
||||
simplejson
|
||||
|
|
|
@ -13,6 +13,7 @@ series:
|
|||
- groovy
|
||||
- hirsute
|
||||
- impish
|
||||
- jammy
|
||||
provides:
|
||||
neutron-plugin-api-subordinate:
|
||||
interface: neutron-plugin-api-subordinate
|
||||
|
|
|
@ -0,0 +1,180 @@
|
|||
variables:
|
||||
openstack-origin: &openstack-origin cloud:focal-yoga
|
||||
|
||||
series: &series focal
|
||||
|
||||
applications:
|
||||
|
||||
keystone-mysql-router:
|
||||
charm: cs:~openstack-charmers-next/mysql-router
|
||||
nova-mysql-router:
|
||||
charm: cs:~openstack-charmers-next/mysql-router
|
||||
glance-mysql-router:
|
||||
charm: cs:~openstack-charmers-next/mysql-router
|
||||
neutron-mysql-router:
|
||||
charm: cs:~openstack-charmers-next/mysql-router
|
||||
placement-mysql-router:
|
||||
charm: cs:~openstack-charmers-next/mysql-router
|
||||
mysql-innodb-cluster:
|
||||
constraints: mem=3072M
|
||||
charm: cs:~openstack-charmers-next/mysql-innodb-cluster
|
||||
num_units: 3
|
||||
options:
|
||||
source: *openstack-origin
|
||||
|
||||
glance:
|
||||
charm: cs:~openstack-charmers-next/glance
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
|
||||
keystone:
|
||||
charm: cs:~openstack-charmers-next/keystone
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
|
||||
neutron-api:
|
||||
charm: cs:~openstack-charmers-next/neutron-api
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
enable-ml2-dns: False
|
||||
flat-network-providers: default
|
||||
vlan-ranges: default:1000:3000
|
||||
vni-ranges: 1001:2000
|
||||
neutron-security-groups: True
|
||||
overlay-network-type: vxlan
|
||||
use-internal-endpoints: True
|
||||
enable-l3ha: True
|
||||
dhcp-agents-per-network: 2
|
||||
enable-ml2-port-security: True
|
||||
default-tenant-network-type: vlan
|
||||
l2-population: False
|
||||
ipv4-ptr-zone-prefix-size:
|
||||
reverse-dns-lookup: False
|
||||
dns-domain:
|
||||
manage-neutron-plugin-legacy-mode: False
|
||||
|
||||
neutron-openvswitch:
|
||||
charm: cs:~openstack-charmers-next/neutron-openvswitch
|
||||
num_units: 0
|
||||
options:
|
||||
prevent-arp-spoofing: True
|
||||
firewall-driver: openvswitch
|
||||
enable-local-dhcp-and-metadata: True
|
||||
bridge-mappings: default:br-data
|
||||
data-port: ens7
|
||||
|
||||
nova-cloud-controller:
|
||||
charm: cs:~openstack-charmers-next/nova-cloud-controller
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
network-manager: Neutron
|
||||
|
||||
neutron-api-plugin-arista:
|
||||
charm: ../../../neutron-api-plugin-arista
|
||||
num_units: 0
|
||||
options:
|
||||
source: *openstack-origin
|
||||
|
||||
# Fake IP, will be set to arista-virt-test-fixture's IP address on test
|
||||
# setup:
|
||||
eapi-host: 192.0.2.42
|
||||
eapi-username: admin
|
||||
eapi-password: password123
|
||||
api-type: EAPI
|
||||
|
||||
placement:
|
||||
charm: cs:~openstack-charmers-next/placement
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
|
||||
nova-compute:
|
||||
charm: cs:~openstack-charmers-next/nova-compute
|
||||
num_units: 2
|
||||
constraints: mem=4G cores=4
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
config-flags: default_ephemeral_format=ext4
|
||||
enable-live-migration: true
|
||||
enable-resize: true
|
||||
migration-auth-type: ssh
|
||||
|
||||
rabbitmq-server:
|
||||
charm: cs:~openstack-charmers-next/rabbitmq-server
|
||||
num_units: 1
|
||||
|
||||
lldpd:
|
||||
charm: cs:lldpd
|
||||
options:
|
||||
interfaces-regex: 'en*'
|
||||
short-name: true
|
||||
|
||||
arista-virt-test-fixture:
|
||||
charm: cs:~openstack-charmers-next/arista-virt-test-fixture
|
||||
num_units: 1
|
||||
constraints: mem=4G
|
||||
|
||||
relations:
|
||||
- - keystone:shared-db
|
||||
- keystone-mysql-router:shared-db
|
||||
- - nova-cloud-controller:shared-db
|
||||
- nova-mysql-router:shared-db
|
||||
- - glance:shared-db
|
||||
- glance-mysql-router:shared-db
|
||||
- - neutron-api:shared-db
|
||||
- neutron-mysql-router:shared-db
|
||||
- - placement:shared-db
|
||||
- placement-mysql-router:shared-db
|
||||
- - keystone-mysql-router:db-router
|
||||
- mysql-innodb-cluster:db-router
|
||||
- - nova-mysql-router:db-router
|
||||
- mysql-innodb-cluster:db-router
|
||||
- - glance-mysql-router:db-router
|
||||
- mysql-innodb-cluster:db-router
|
||||
- - neutron-mysql-router:db-router
|
||||
- mysql-innodb-cluster:db-router
|
||||
- - placement-mysql-router:db-router
|
||||
- mysql-innodb-cluster:db-router
|
||||
|
||||
- - nova-compute:amqp
|
||||
- rabbitmq-server:amqp
|
||||
- - nova-cloud-controller:identity-service
|
||||
- keystone:identity-service
|
||||
- - glance:identity-service
|
||||
- keystone:identity-service
|
||||
- - neutron-api:identity-service
|
||||
- keystone:identity-service
|
||||
- - neutron-openvswitch:neutron-plugin-api
|
||||
- neutron-api:neutron-plugin-api
|
||||
- - neutron-api:amqp
|
||||
- rabbitmq-server:amqp
|
||||
- - glance:amqp
|
||||
- rabbitmq-server:amqp
|
||||
- - nova-cloud-controller:image-service
|
||||
- glance:image-service
|
||||
- - nova-compute:image-service
|
||||
- glance:image-service
|
||||
- - nova-cloud-controller:cloud-compute
|
||||
- nova-compute:cloud-compute
|
||||
- - nova-cloud-controller:amqp
|
||||
- rabbitmq-server:amqp
|
||||
- - nova-compute:neutron-plugin
|
||||
- neutron-openvswitch:neutron-plugin
|
||||
- - neutron-openvswitch:amqp
|
||||
- rabbitmq-server:amqp
|
||||
- - nova-cloud-controller:neutron-api
|
||||
- neutron-api:neutron-api
|
||||
- - neutron-api
|
||||
- neutron-api-plugin-arista
|
||||
- - neutron-api:neutron-plugin-api-subordinate
|
||||
- neutron-api-plugin-arista:neutron-plugin-api-subordinate
|
||||
- - lldpd
|
||||
- nova-compute
|
||||
- - placement:identity-service
|
||||
- keystone:identity-service
|
||||
- - placement:placement
|
||||
- nova-cloud-controller:placement
|
|
@ -0,0 +1,184 @@
|
|||
variables:
|
||||
openstack-origin: &openstack-origin distro
|
||||
|
||||
series: &series jammy
|
||||
|
||||
applications:
|
||||
|
||||
keystone-mysql-router:
|
||||
charm: cs:~openstack-charmers-next/mysql-router
|
||||
nova-mysql-router:
|
||||
charm: cs:~openstack-charmers-next/mysql-router
|
||||
glance-mysql-router:
|
||||
charm: cs:~openstack-charmers-next/mysql-router
|
||||
neutron-mysql-router:
|
||||
charm: cs:~openstack-charmers-next/mysql-router
|
||||
placement-mysql-router:
|
||||
charm: cs:~openstack-charmers-next/mysql-router
|
||||
mysql-innodb-cluster:
|
||||
constraints: mem=3072M
|
||||
charm: cs:~openstack-charmers-next/mysql-innodb-cluster
|
||||
num_units: 3
|
||||
options:
|
||||
source: *openstack-origin
|
||||
|
||||
glance:
|
||||
charm: cs:~openstack-charmers-next/glance
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
|
||||
keystone:
|
||||
charm: cs:~openstack-charmers-next/keystone
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
|
||||
neutron-api:
|
||||
charm: cs:~openstack-charmers-next/neutron-api
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
enable-ml2-dns: False
|
||||
flat-network-providers: default
|
||||
vlan-ranges: default:1000:3000
|
||||
vni-ranges: 1001:2000
|
||||
neutron-security-groups: True
|
||||
overlay-network-type: vxlan
|
||||
use-internal-endpoints: True
|
||||
enable-l3ha: True
|
||||
dhcp-agents-per-network: 2
|
||||
enable-ml2-port-security: True
|
||||
default-tenant-network-type: vlan
|
||||
l2-population: False
|
||||
ipv4-ptr-zone-prefix-size:
|
||||
reverse-dns-lookup: False
|
||||
dns-domain:
|
||||
manage-neutron-plugin-legacy-mode: False
|
||||
|
||||
neutron-openvswitch:
|
||||
charm: cs:~openstack-charmers-next/neutron-openvswitch
|
||||
num_units: 0
|
||||
options:
|
||||
prevent-arp-spoofing: True
|
||||
firewall-driver: openvswitch
|
||||
enable-local-dhcp-and-metadata: True
|
||||
bridge-mappings: default:br-data
|
||||
data-port: ens7
|
||||
|
||||
nova-cloud-controller:
|
||||
charm: cs:~openstack-charmers-next/nova-cloud-controller
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
network-manager: Neutron
|
||||
|
||||
neutron-api-plugin-arista:
|
||||
charm: ../../../neutron-api-plugin-arista
|
||||
num_units: 0
|
||||
options:
|
||||
source: *openstack-origin
|
||||
|
||||
# Fake IP, will be set to arista-virt-test-fixture's IP address on test
|
||||
# setup:
|
||||
eapi-host: 192.0.2.42
|
||||
eapi-username: admin
|
||||
eapi-password: password123
|
||||
api-type: EAPI
|
||||
|
||||
placement:
|
||||
charm: cs:~openstack-charmers-next/placement
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
|
||||
nova-compute:
|
||||
charm: cs:~openstack-charmers-next/nova-compute
|
||||
num_units: 2
|
||||
constraints: mem=4G cores=4
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
config-flags: default_ephemeral_format=ext4
|
||||
enable-live-migration: true
|
||||
enable-resize: true
|
||||
migration-auth-type: ssh
|
||||
|
||||
rabbitmq-server:
|
||||
charm: cs:~openstack-charmers-next/rabbitmq-server
|
||||
num_units: 1
|
||||
|
||||
lldpd:
|
||||
charm: cs:lldpd
|
||||
options:
|
||||
interfaces-regex: 'en*'
|
||||
short-name: true
|
||||
|
||||
arista-virt-test-fixture:
|
||||
# NOTE(lourot): workaround - this charm doesn't work on hirsute+ yet
|
||||
# see https://github.com/openstack-charmers/charm-arista-virt-test-fixture/issues/11
|
||||
series: groovy
|
||||
|
||||
charm: cs:~openstack-charmers-next/arista-virt-test-fixture
|
||||
num_units: 1
|
||||
constraints: mem=4G
|
||||
|
||||
relations:
|
||||
- - keystone:shared-db
|
||||
- keystone-mysql-router:shared-db
|
||||
- - nova-cloud-controller:shared-db
|
||||
- nova-mysql-router:shared-db
|
||||
- - glance:shared-db
|
||||
- glance-mysql-router:shared-db
|
||||
- - neutron-api:shared-db
|
||||
- neutron-mysql-router:shared-db
|
||||
- - placement:shared-db
|
||||
- placement-mysql-router:shared-db
|
||||
- - keystone-mysql-router:db-router
|
||||
- mysql-innodb-cluster:db-router
|
||||
- - nova-mysql-router:db-router
|
||||
- mysql-innodb-cluster:db-router
|
||||
- - glance-mysql-router:db-router
|
||||
- mysql-innodb-cluster:db-router
|
||||
- - neutron-mysql-router:db-router
|
||||
- mysql-innodb-cluster:db-router
|
||||
- - placement-mysql-router:db-router
|
||||
- mysql-innodb-cluster:db-router
|
||||
|
||||
- - nova-compute:amqp
|
||||
- rabbitmq-server:amqp
|
||||
- - nova-cloud-controller:identity-service
|
||||
- keystone:identity-service
|
||||
- - glance:identity-service
|
||||
- keystone:identity-service
|
||||
- - neutron-api:identity-service
|
||||
- keystone:identity-service
|
||||
- - neutron-openvswitch:neutron-plugin-api
|
||||
- neutron-api:neutron-plugin-api
|
||||
- - neutron-api:amqp
|
||||
- rabbitmq-server:amqp
|
||||
- - glance:amqp
|
||||
- rabbitmq-server:amqp
|
||||
- - nova-cloud-controller:image-service
|
||||
- glance:image-service
|
||||
- - nova-compute:image-service
|
||||
- glance:image-service
|
||||
- - nova-cloud-controller:cloud-compute
|
||||
- nova-compute:cloud-compute
|
||||
- - nova-cloud-controller:amqp
|
||||
- rabbitmq-server:amqp
|
||||
- - nova-compute:neutron-plugin
|
||||
- neutron-openvswitch:neutron-plugin
|
||||
- - neutron-openvswitch:amqp
|
||||
- rabbitmq-server:amqp
|
||||
- - nova-cloud-controller:neutron-api
|
||||
- neutron-api:neutron-api
|
||||
- - neutron-api
|
||||
- neutron-api-plugin-arista
|
||||
- - neutron-api:neutron-plugin-api-subordinate
|
||||
- neutron-api-plugin-arista:neutron-plugin-api-subordinate
|
||||
- - lldpd
|
||||
- nova-compute
|
||||
- - placement:identity-service
|
||||
- keystone:identity-service
|
||||
- - placement:placement
|
||||
- nova-cloud-controller:placement
|
|
@ -0,0 +1 @@
|
|||
arista-virt-test-fixture-image.yaml.j2
|
|
@ -0,0 +1 @@
|
|||
arista-virt-test-fixture-image.yaml.j2
|
|
@ -1,24 +1,25 @@
|
|||
charm_name: neutron-api-plugin-arista
|
||||
|
||||
smoke_bundles:
|
||||
- bionic-train
|
||||
- focal-ussuri
|
||||
|
||||
gate_bundles:
|
||||
- bionic-queens
|
||||
- bionic-stein
|
||||
- bionic-train
|
||||
- bionic-ussuri
|
||||
- focal-ussuri
|
||||
- focal-victoria
|
||||
- focal-wallaby
|
||||
- focal-xena
|
||||
- hirsute-wallaby
|
||||
- impish-xena
|
||||
|
||||
dev_bundles:
|
||||
- xenial-queens
|
||||
- bionic-rocky
|
||||
- focal-xena
|
||||
- groovy-victoria
|
||||
- impish-xena
|
||||
- bionic-train
|
||||
- focal-yoga
|
||||
- jammy-yoga
|
||||
|
||||
before_deploy:
|
||||
- zaza.openstack.charm_tests.neutron_arista.setup.download_arista_image
|
||||
|
@ -31,5 +32,6 @@ tests:
|
|||
|
||||
tests_options:
|
||||
force_deploy:
|
||||
- groovy-victoria
|
||||
- hirsute-wallaby
|
||||
- impish-xena
|
||||
- jammy-yoga
|
||||
|
|
|
@ -3,6 +3,8 @@
|
|||
# choices of *requirements.txt files for OpenStack Charms:
|
||||
# https://github.com/openstack-charmers/release-tools
|
||||
#
|
||||
pyparsing<3.0.0 # aodhclient is pinned in zaza and needs pyparsing < 3.0.0, but cffi also needs it, so pin here.
|
||||
cffi==1.14.6; python_version < '3.6' # cffi 1.15.0 drops support for py35.
|
||||
setuptools<50.0.0 # https://github.com/pypa/setuptools/commit/04e3df22df840c6bb244e9b27bc56750c44b7c85
|
||||
|
||||
stestr>=2.2.0
|
||||
|
|
Loading…
Reference in New Issue