Add yoga bundles and release-tool syncs
* charm-helpers sync for classic charms * sync from release-tools * switch to release-specific zosci functional tests * run focal-ussuri as smoke tests * remove trusty, xenial, and groovy metadata/tests * drop py35 and add py39 * drop bluestore model alias to simplify osci.yaml Change-Id: I1df6bb74fd96d934aa97cce18307a3227b165882
This commit is contained in:
parent
bee914c6bf
commit
b455c46541
105
osci.yaml
105
osci.yaml
|
@ -1,102 +1,13 @@
|
||||||
- job:
|
|
||||||
name: bionic-queens_local
|
|
||||||
parent: bionic-queens
|
|
||||||
dependencies:
|
|
||||||
- osci-lint
|
|
||||||
- tox-py35
|
|
||||||
- tox-py36
|
|
||||||
- tox-py37
|
|
||||||
- tox-py38
|
|
||||||
- job:
|
|
||||||
name: impish-xena-bluestore
|
|
||||||
parent: func-target
|
|
||||||
dependencies: &smoke-jobs
|
|
||||||
- bionic-queens_local
|
|
||||||
vars:
|
|
||||||
tox_extra_args: bluestore-compression:impish-xena
|
|
||||||
- job:
|
|
||||||
name: hirsute-wallaby-bluestore
|
|
||||||
parent: func-target
|
|
||||||
dependencies: *smoke-jobs
|
|
||||||
vars:
|
|
||||||
tox_extra_args: bluestore-compression:hirsute-wallaby
|
|
||||||
- job:
|
|
||||||
name: groovy-victoria-bluestore
|
|
||||||
parent: func-target
|
|
||||||
dependencies: *smoke-jobs
|
|
||||||
vars:
|
|
||||||
tox_extra_args: bluestore-compression:groovy-victoria
|
|
||||||
- job:
|
|
||||||
name: xenial-mitaka_local
|
|
||||||
parent: xenial-mitaka
|
|
||||||
dependencies: *smoke-jobs
|
|
||||||
- job:
|
|
||||||
name: focal-wallaby-bluestore
|
|
||||||
parent: func-target
|
|
||||||
dependencies: *smoke-jobs
|
|
||||||
vars:
|
|
||||||
tox_extra_args: bluestore-compression:focal-wallaby
|
|
||||||
- job:
|
|
||||||
name: focal-xena-bluestore
|
|
||||||
parent: func-target
|
|
||||||
dependencies: *smoke-jobs
|
|
||||||
vars:
|
|
||||||
tox_extra_args: bluestore-compression:focal-xena
|
|
||||||
- job:
|
|
||||||
name: focal-victoria-bluestore
|
|
||||||
parent: func-target
|
|
||||||
dependencies: *smoke-jobs
|
|
||||||
vars:
|
|
||||||
tox_extra_args: bluestore-compression:focal-victoria
|
|
||||||
- job:
|
|
||||||
name: focal-ussuri-bluestore
|
|
||||||
parent: func-target
|
|
||||||
dependencies: *smoke-jobs
|
|
||||||
vars:
|
|
||||||
tox_extra_args: bluestore-compression:focal-ussuri
|
|
||||||
- job:
|
|
||||||
name: bionic-ussuri-bluestore
|
|
||||||
parent: func-target
|
|
||||||
dependencies: *smoke-jobs
|
|
||||||
vars:
|
|
||||||
tox_extra_args: bluestore-compression:bionic-ussuri
|
|
||||||
- job:
|
|
||||||
name: bionic-train-bluestore
|
|
||||||
parent: func-target
|
|
||||||
dependencies: *smoke-jobs
|
|
||||||
vars:
|
|
||||||
tox_extra_args: bluestore-compression:bionic-train
|
|
||||||
- job:
|
|
||||||
name: bionic-stein-bluestore
|
|
||||||
parent: func-target
|
|
||||||
dependencies: *smoke-jobs
|
|
||||||
vars:
|
|
||||||
tox_extra_args: bluestore-compression:bionic-stein
|
|
||||||
|
|
||||||
- project:
|
- project:
|
||||||
templates:
|
templates:
|
||||||
- charm-unit-jobs
|
- charm-yoga-unit-jobs
|
||||||
# using overridden, shorter functional list because the charm does
|
- charm-yoga-functional-jobs
|
||||||
# already in the tests.yaml
|
- charm-xena-functional-jobs
|
||||||
# - charm-functional-jobs
|
- charm-wallaby-functional-jobs
|
||||||
check:
|
- charm-victoria-functional-jobs
|
||||||
jobs:
|
- charm-ussuri-functional-jobs
|
||||||
- bionic-queens_local
|
- charm-stein-functional-jobs
|
||||||
# Xenial-pike is missing because of
|
- charm-queens-functional-jobs
|
||||||
# https://bugs.launchpad.net/charm-nova-compute/+bug/1862624
|
|
||||||
- xenial-mitaka_local
|
|
||||||
- impish-xena-bluestore:
|
|
||||||
voting: false
|
|
||||||
- hirsute-wallaby-bluestore
|
|
||||||
- groovy-victoria-bluestore
|
|
||||||
- focal-xena-bluestore:
|
|
||||||
voting: false
|
|
||||||
- focal-wallaby-bluestore
|
|
||||||
- focal-victoria-bluestore
|
|
||||||
- focal-ussuri-bluestore
|
|
||||||
- bionic-ussuri-bluestore
|
|
||||||
- bionic-train-bluestore
|
|
||||||
- bionic-stein-bluestore
|
|
||||||
vars:
|
vars:
|
||||||
needs_charm_build: true
|
needs_charm_build: true
|
||||||
charm_build_name: ceph-fs
|
charm_build_name: ceph-fs
|
||||||
|
|
|
@ -9,6 +9,7 @@
|
||||||
setuptools<50.0.0 # https://github.com/pypa/setuptools/commit/04e3df22df840c6bb244e9b27bc56750c44b7c85
|
setuptools<50.0.0 # https://github.com/pypa/setuptools/commit/04e3df22df840c6bb244e9b27bc56750c44b7c85
|
||||||
|
|
||||||
# Build requirements
|
# Build requirements
|
||||||
|
cffi==1.14.6; python_version < '3.6' # cffi 1.15.0 drops support for py35.
|
||||||
charm-tools==2.8.3
|
charm-tools==2.8.3
|
||||||
|
|
||||||
simplejson
|
simplejson
|
||||||
|
|
|
@ -10,7 +10,6 @@ tags:
|
||||||
- file-servers
|
- file-servers
|
||||||
- misc
|
- misc
|
||||||
series:
|
series:
|
||||||
- xenial
|
|
||||||
- bionic
|
- bionic
|
||||||
- focal
|
- focal
|
||||||
- groovy
|
- groovy
|
||||||
|
|
|
@ -0,0 +1,222 @@
|
||||||
|
variables:
|
||||||
|
openstack-origin: &openstack-origin cloud:focal-yoga
|
||||||
|
|
||||||
|
series: &series focal
|
||||||
|
|
||||||
|
machines:
|
||||||
|
'0':
|
||||||
|
constraints: "mem=3072M"
|
||||||
|
'1':
|
||||||
|
constraints: "mem=3072M"
|
||||||
|
'2':
|
||||||
|
constraints: "mem=3072M"
|
||||||
|
'3':
|
||||||
|
|
||||||
|
|
||||||
|
applications:
|
||||||
|
|
||||||
|
keystone-mysql-router:
|
||||||
|
charm: cs:~openstack-charmers-next/mysql-router
|
||||||
|
glance-mysql-router:
|
||||||
|
charm: cs:~openstack-charmers-next/mysql-router
|
||||||
|
nova-cloud-controller-mysql-router:
|
||||||
|
charm: cs:~openstack-charmers-next/mysql-router
|
||||||
|
placement-mysql-router:
|
||||||
|
charm: cs:~openstack-charmers-next/mysql-router
|
||||||
|
neutron-api-mysql-router:
|
||||||
|
charm: cs:~openstack-charmers-next/mysql-router
|
||||||
|
|
||||||
|
mysql-innodb-cluster:
|
||||||
|
charm: cs:~openstack-charmers-next/mysql-innodb-cluster
|
||||||
|
num_units: 3
|
||||||
|
options:
|
||||||
|
source: *openstack-origin
|
||||||
|
to:
|
||||||
|
- '0'
|
||||||
|
- '1'
|
||||||
|
- '2'
|
||||||
|
|
||||||
|
ceph-fs:
|
||||||
|
charm: ceph-fs
|
||||||
|
num_units: 1
|
||||||
|
options:
|
||||||
|
source: *openstack-origin
|
||||||
|
pool-type: erasure-coded
|
||||||
|
ec-profile-k: 4
|
||||||
|
ec-profile-m: 2
|
||||||
|
to:
|
||||||
|
- '3'
|
||||||
|
|
||||||
|
ceph-osd:
|
||||||
|
charm: cs:~openstack-charmers-next/ceph-osd
|
||||||
|
num_units: 6
|
||||||
|
storage:
|
||||||
|
osd-devices: 'cinder,10G'
|
||||||
|
options:
|
||||||
|
osd-devices: '/dev/test-non-existent'
|
||||||
|
source: *openstack-origin
|
||||||
|
|
||||||
|
ceph-mon:
|
||||||
|
charm: cs:~openstack-charmers-next/ceph-mon
|
||||||
|
num_units: 3
|
||||||
|
options:
|
||||||
|
monitor-count: '3'
|
||||||
|
source: *openstack-origin
|
||||||
|
|
||||||
|
rabbitmq-server:
|
||||||
|
charm: cs:~openstack-charmers-next/rabbitmq-server
|
||||||
|
num_units: 1
|
||||||
|
options:
|
||||||
|
source: *openstack-origin
|
||||||
|
|
||||||
|
keystone:
|
||||||
|
expose: True
|
||||||
|
charm: cs:~openstack-charmers-next/keystone
|
||||||
|
num_units: 1
|
||||||
|
options:
|
||||||
|
openstack-origin: *openstack-origin
|
||||||
|
|
||||||
|
glance:
|
||||||
|
expose: True
|
||||||
|
charm: cs:~openstack-charmers-next/glance
|
||||||
|
num_units: 1
|
||||||
|
options:
|
||||||
|
openstack-origin: *openstack-origin
|
||||||
|
|
||||||
|
nova-cloud-controller:
|
||||||
|
expose: True
|
||||||
|
charm: cs:~openstack-charmers-next/nova-cloud-controller
|
||||||
|
num_units: 1
|
||||||
|
options:
|
||||||
|
network-manager: Neutron
|
||||||
|
openstack-origin: *openstack-origin
|
||||||
|
|
||||||
|
nova-compute:
|
||||||
|
charm: cs:~openstack-charmers-next/nova-compute
|
||||||
|
num_units: 2
|
||||||
|
constraints: mem=8G
|
||||||
|
options:
|
||||||
|
config-flags: default_ephemeral_format=ext4
|
||||||
|
enable-live-migration: true
|
||||||
|
enable-resize: true
|
||||||
|
migration-auth-type: ssh
|
||||||
|
openstack-origin: *openstack-origin
|
||||||
|
|
||||||
|
placement:
|
||||||
|
charm: cs:~openstack-charmers-next/placement
|
||||||
|
num_units: 1
|
||||||
|
options:
|
||||||
|
openstack-origin: *openstack-origin
|
||||||
|
|
||||||
|
neutron-api:
|
||||||
|
charm: cs:~openstack-charmers-next/neutron-api
|
||||||
|
num_units: 1
|
||||||
|
options:
|
||||||
|
manage-neutron-plugin-legacy-mode: true
|
||||||
|
neutron-plugin: ovs
|
||||||
|
flat-network-providers: physnet1
|
||||||
|
neutron-security-groups: true
|
||||||
|
openstack-origin: *openstack-origin
|
||||||
|
|
||||||
|
neutron-openvswitch:
|
||||||
|
charm: cs:~openstack-charmers-next/neutron-openvswitch
|
||||||
|
|
||||||
|
neutron-gateway:
|
||||||
|
charm: cs:~openstack-charmers-next/neutron-gateway
|
||||||
|
num_units: 1
|
||||||
|
options:
|
||||||
|
bridge-mappings: physnet1:br-ex
|
||||||
|
openstack-origin: *openstack-origin
|
||||||
|
|
||||||
|
relations:
|
||||||
|
|
||||||
|
- - 'ceph-mon:mds'
|
||||||
|
- 'ceph-fs:ceph-mds'
|
||||||
|
|
||||||
|
- - 'nova-compute:amqp'
|
||||||
|
- 'rabbitmq-server:amqp'
|
||||||
|
|
||||||
|
- - 'nova-compute:image-service'
|
||||||
|
- 'glance:image-service'
|
||||||
|
|
||||||
|
- - 'nova-compute:ceph'
|
||||||
|
- 'ceph-mon:client'
|
||||||
|
|
||||||
|
- - 'keystone:shared-db'
|
||||||
|
- 'keystone-mysql-router:shared-db'
|
||||||
|
- - 'keystone-mysql-router:db-router'
|
||||||
|
- 'mysql-innodb-cluster:db-router'
|
||||||
|
|
||||||
|
- - 'glance:shared-db'
|
||||||
|
- 'glance-mysql-router:shared-db'
|
||||||
|
- - 'glance-mysql-router:db-router'
|
||||||
|
- 'mysql-innodb-cluster:db-router'
|
||||||
|
|
||||||
|
- - 'glance:identity-service'
|
||||||
|
- 'keystone:identity-service'
|
||||||
|
|
||||||
|
- - 'glance:amqp'
|
||||||
|
- 'rabbitmq-server:amqp'
|
||||||
|
|
||||||
|
- - 'glance:ceph'
|
||||||
|
- 'ceph-mon:client'
|
||||||
|
|
||||||
|
- - 'ceph-osd:mon'
|
||||||
|
- 'ceph-mon:osd'
|
||||||
|
|
||||||
|
- - 'nova-cloud-controller:shared-db'
|
||||||
|
- 'nova-cloud-controller-mysql-router:shared-db'
|
||||||
|
- - 'nova-cloud-controller-mysql-router:db-router'
|
||||||
|
- 'mysql-innodb-cluster:db-router'
|
||||||
|
|
||||||
|
- - 'nova-cloud-controller:identity-service'
|
||||||
|
- 'keystone:identity-service'
|
||||||
|
|
||||||
|
- - 'nova-cloud-controller:amqp'
|
||||||
|
- 'rabbitmq-server:amqp'
|
||||||
|
|
||||||
|
- - 'nova-cloud-controller:cloud-compute'
|
||||||
|
- 'nova-compute:cloud-compute'
|
||||||
|
|
||||||
|
- - 'nova-cloud-controller:image-service'
|
||||||
|
- 'glance:image-service'
|
||||||
|
|
||||||
|
- - 'placement:shared-db'
|
||||||
|
- 'placement-mysql-router:shared-db'
|
||||||
|
- - 'placement-mysql-router:db-router'
|
||||||
|
- 'mysql-innodb-cluster:db-router'
|
||||||
|
|
||||||
|
- - 'placement'
|
||||||
|
- 'keystone'
|
||||||
|
|
||||||
|
- - 'placement'
|
||||||
|
- 'nova-cloud-controller'
|
||||||
|
|
||||||
|
- - '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'
|
||||||
|
|
||||||
|
- - 'nova-compute:neutron-plugin'
|
||||||
|
- 'neutron-openvswitch:neutron-plugin'
|
||||||
|
|
||||||
|
- - 'neutron-gateway:amqp'
|
||||||
|
- 'rabbitmq-server:amqp'
|
||||||
|
|
||||||
|
- - 'neutron-openvswitch:amqp'
|
||||||
|
- 'rabbitmq-server:amqp'
|
||||||
|
|
||||||
|
- - 'nova-cloud-controller:quantum-network-service'
|
||||||
|
- 'neutron-gateway:quantum-network-service'
|
|
@ -1,7 +1,7 @@
|
||||||
variables:
|
variables:
|
||||||
openstack-origin: &openstack-origin distro
|
openstack-origin: &openstack-origin distro
|
||||||
|
|
||||||
series: &series groovy
|
series: &series jammy
|
||||||
|
|
||||||
machines:
|
machines:
|
||||||
'0':
|
'0':
|
|
@ -1,112 +0,0 @@
|
||||||
series: xenial
|
|
||||||
applications:
|
|
||||||
ceph-fs:
|
|
||||||
charm: ceph-fs
|
|
||||||
series: xenial
|
|
||||||
num_units: 1
|
|
||||||
ceph-osd:
|
|
||||||
charm: cs:~openstack-charmers-next/ceph-osd
|
|
||||||
num_units: 3
|
|
||||||
storage:
|
|
||||||
osd-devices: 'cinder,10G'
|
|
||||||
options:
|
|
||||||
osd-devices: '/srv/ceph /dev/test-non-existent'
|
|
||||||
ceph-mon:
|
|
||||||
charm: cs:~openstack-charmers-next/ceph-mon
|
|
||||||
num_units: 3
|
|
||||||
options:
|
|
||||||
monitor-count: '3'
|
|
||||||
percona-cluster:
|
|
||||||
charm: cs:~openstack-charmers-next/percona-cluster
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
dataset-size: 25%
|
|
||||||
max-connections: 1000
|
|
||||||
rabbitmq-server:
|
|
||||||
charm: cs:~openstack-charmers-next/rabbitmq-server
|
|
||||||
num_units: 1
|
|
||||||
keystone:
|
|
||||||
expose: True
|
|
||||||
charm: cs:~openstack-charmers-next/keystone
|
|
||||||
num_units: 1
|
|
||||||
glance:
|
|
||||||
expose: True
|
|
||||||
charm: cs:~openstack-charmers-next/glance
|
|
||||||
num_units: 1
|
|
||||||
nova-cloud-controller:
|
|
||||||
expose: True
|
|
||||||
charm: cs:~openstack-charmers-next/nova-cloud-controller
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
network-manager: Neutron
|
|
||||||
nova-compute:
|
|
||||||
charm: cs:~openstack-charmers-next/nova-compute
|
|
||||||
num_units: 2
|
|
||||||
constraints: mem=8G
|
|
||||||
options:
|
|
||||||
config-flags: default_ephemeral_format=ext4
|
|
||||||
enable-live-migration: true
|
|
||||||
enable-resize: true
|
|
||||||
migration-auth-type: ssh
|
|
||||||
neutron-api:
|
|
||||||
charm: cs:~openstack-charmers-next/neutron-api
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
flat-network-providers: physnet1
|
|
||||||
neutron-security-groups: true
|
|
||||||
neutron-openvswitch:
|
|
||||||
charm: cs:~openstack-charmers-next/neutron-openvswitch
|
|
||||||
neutron-gateway:
|
|
||||||
charm: cs:~openstack-charmers-next/neutron-gateway
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
bridge-mappings: physnet1:br-ex
|
|
||||||
relations:
|
|
||||||
- - ceph-mon:mds
|
|
||||||
- ceph-fs:ceph-mds
|
|
||||||
- - nova-compute:amqp
|
|
||||||
- rabbitmq-server:amqp
|
|
||||||
- - nova-compute:image-service
|
|
||||||
- glance:image-service
|
|
||||||
- - nova-compute:ceph
|
|
||||||
- ceph-mon:client
|
|
||||||
- - keystone:shared-db
|
|
||||||
- percona-cluster:shared-db
|
|
||||||
- - glance:shared-db
|
|
||||||
- percona-cluster:shared-db
|
|
||||||
- - glance:identity-service
|
|
||||||
- keystone:identity-service
|
|
||||||
- - glance:amqp
|
|
||||||
- rabbitmq-server:amqp
|
|
||||||
- - glance:ceph
|
|
||||||
- ceph-mon:client
|
|
||||||
- - ceph-osd:mon
|
|
||||||
- ceph-mon:osd
|
|
||||||
- - nova-cloud-controller:shared-db
|
|
||||||
- percona-cluster:shared-db
|
|
||||||
- - nova-cloud-controller:identity-service
|
|
||||||
- keystone:identity-service
|
|
||||||
- - nova-cloud-controller:amqp
|
|
||||||
- rabbitmq-server:amqp
|
|
||||||
- - nova-cloud-controller:cloud-compute
|
|
||||||
- nova-compute:cloud-compute
|
|
||||||
- - nova-cloud-controller:image-service
|
|
||||||
- glance:image-service
|
|
||||||
- - 'neutron-api:shared-db'
|
|
||||||
- 'percona-cluster:shared-db'
|
|
||||||
- - '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'
|
|
||||||
- - 'nova-compute:neutron-plugin'
|
|
||||||
- 'neutron-openvswitch:neutron-plugin'
|
|
||||||
- - 'neutron-gateway:amqp'
|
|
||||||
- 'rabbitmq-server:amqp'
|
|
||||||
- - 'neutron-openvswitch:amqp'
|
|
||||||
- 'rabbitmq-server:amqp'
|
|
||||||
- - 'nova-cloud-controller:quantum-network-service'
|
|
||||||
- 'neutron-gateway:quantum-network-service'
|
|
|
@ -1,127 +0,0 @@
|
||||||
series: xenial
|
|
||||||
applications:
|
|
||||||
ceph-fs:
|
|
||||||
charm: ceph-fs
|
|
||||||
series: xenial
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
source: cloud:xenial-ocata
|
|
||||||
ceph-osd:
|
|
||||||
charm: cs:~openstack-charmers-next/ceph-osd
|
|
||||||
num_units: 3
|
|
||||||
storage:
|
|
||||||
osd-devices: 'cinder,10G'
|
|
||||||
options:
|
|
||||||
osd-devices: '/srv/ceph /dev/test-non-existent'
|
|
||||||
source: cloud:xenial-ocata
|
|
||||||
ceph-mon:
|
|
||||||
charm: cs:~openstack-charmers-next/ceph-mon
|
|
||||||
num_units: 3
|
|
||||||
options:
|
|
||||||
monitor-count: '3'
|
|
||||||
source: cloud:xenial-ocata
|
|
||||||
percona-cluster:
|
|
||||||
charm: cs:~openstack-charmers-next/percona-cluster
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
dataset-size: 25%
|
|
||||||
max-connections: 1000
|
|
||||||
source: cloud:xenial-ocata
|
|
||||||
rabbitmq-server:
|
|
||||||
charm: cs:~openstack-charmers-next/rabbitmq-server
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
source: cloud:xenial-ocata
|
|
||||||
keystone:
|
|
||||||
expose: True
|
|
||||||
charm: cs:~openstack-charmers-next/keystone
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
openstack-origin: cloud:xenial-ocata
|
|
||||||
glance:
|
|
||||||
expose: True
|
|
||||||
charm: cs:~openstack-charmers-next/glance
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
openstack-origin: cloud:xenial-ocata
|
|
||||||
nova-cloud-controller:
|
|
||||||
expose: True
|
|
||||||
charm: cs:~openstack-charmers-next/nova-cloud-controller
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
network-manager: Neutron
|
|
||||||
openstack-origin: cloud:xenial-ocata
|
|
||||||
nova-compute:
|
|
||||||
charm: cs:~openstack-charmers-next/nova-compute
|
|
||||||
num_units: 2
|
|
||||||
constraints: mem=8G
|
|
||||||
options:
|
|
||||||
config-flags: default_ephemeral_format=ext4
|
|
||||||
enable-live-migration: true
|
|
||||||
enable-resize: true
|
|
||||||
migration-auth-type: ssh
|
|
||||||
openstack-origin: cloud:xenial-ocata
|
|
||||||
neutron-api:
|
|
||||||
charm: cs:~openstack-charmers-next/neutron-api
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
flat-network-providers: physnet1
|
|
||||||
neutron-security-groups: true
|
|
||||||
openstack-origin: cloud:xenial-ocata
|
|
||||||
neutron-openvswitch:
|
|
||||||
charm: cs:~openstack-charmers-next/neutron-openvswitch
|
|
||||||
neutron-gateway:
|
|
||||||
charm: cs:~openstack-charmers-next/neutron-gateway
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
bridge-mappings: physnet1:br-ex
|
|
||||||
openstack-origin: cloud:xenial-ocata
|
|
||||||
relations:
|
|
||||||
- - ceph-mon:mds
|
|
||||||
- ceph-fs:ceph-mds
|
|
||||||
- - nova-compute:amqp
|
|
||||||
- rabbitmq-server:amqp
|
|
||||||
- - nova-compute:image-service
|
|
||||||
- glance:image-service
|
|
||||||
- - nova-compute:ceph
|
|
||||||
- ceph-mon:client
|
|
||||||
- - keystone:shared-db
|
|
||||||
- percona-cluster:shared-db
|
|
||||||
- - glance:shared-db
|
|
||||||
- percona-cluster:shared-db
|
|
||||||
- - glance:identity-service
|
|
||||||
- keystone:identity-service
|
|
||||||
- - glance:amqp
|
|
||||||
- rabbitmq-server:amqp
|
|
||||||
- - glance:ceph
|
|
||||||
- ceph-mon:client
|
|
||||||
- - ceph-osd:mon
|
|
||||||
- ceph-mon:osd
|
|
||||||
- - nova-cloud-controller:shared-db
|
|
||||||
- percona-cluster:shared-db
|
|
||||||
- - nova-cloud-controller:identity-service
|
|
||||||
- keystone:identity-service
|
|
||||||
- - nova-cloud-controller:amqp
|
|
||||||
- rabbitmq-server:amqp
|
|
||||||
- - nova-cloud-controller:cloud-compute
|
|
||||||
- nova-compute:cloud-compute
|
|
||||||
- - nova-cloud-controller:image-service
|
|
||||||
- glance:image-service
|
|
||||||
- - 'neutron-api:shared-db'
|
|
||||||
- 'percona-cluster:shared-db'
|
|
||||||
- - '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'
|
|
||||||
- - 'nova-compute:neutron-plugin'
|
|
||||||
- 'neutron-openvswitch:neutron-plugin'
|
|
||||||
- - 'neutron-gateway:amqp'
|
|
||||||
- 'rabbitmq-server:amqp'
|
|
||||||
- - 'neutron-openvswitch:amqp'
|
|
||||||
- 'rabbitmq-server:amqp'
|
|
||||||
- - 'nova-cloud-controller:quantum-network-service'
|
|
||||||
- 'neutron-gateway:quantum-network-service'
|
|
|
@ -1,123 +0,0 @@
|
||||||
series: xenial
|
|
||||||
applications:
|
|
||||||
ceph-fs:
|
|
||||||
charm: ceph-fs
|
|
||||||
series: xenial
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
source: cloud:xenial-pike
|
|
||||||
ceph-osd:
|
|
||||||
charm: cs:~openstack-charmers-next/ceph-osd
|
|
||||||
num_units: 3
|
|
||||||
storage:
|
|
||||||
osd-devices: 'cinder,10G'
|
|
||||||
options:
|
|
||||||
osd-devices: '/srv/ceph /dev/test-non-existent'
|
|
||||||
source: cloud:xenial-pike
|
|
||||||
ceph-mon:
|
|
||||||
charm: cs:~openstack-charmers-next/ceph-mon
|
|
||||||
num_units: 3
|
|
||||||
options:
|
|
||||||
monitor-count: '3'
|
|
||||||
source: cloud:xenial-pike
|
|
||||||
percona-cluster:
|
|
||||||
charm: cs:~openstack-charmers-next/percona-cluster
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
dataset-size: 25%
|
|
||||||
max-connections: 1000
|
|
||||||
source: cloud:xenial-pike
|
|
||||||
rabbitmq-server:
|
|
||||||
charm: cs:~openstack-charmers-next/rabbitmq-server
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
source: cloud:xenial-pike
|
|
||||||
keystone:
|
|
||||||
expose: True
|
|
||||||
charm: cs:~openstack-charmers-next/keystone
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
openstack-origin: cloud:xenial-pike
|
|
||||||
glance:
|
|
||||||
expose: True
|
|
||||||
charm: cs:~openstack-charmers-next/glance
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
openstack-origin: cloud:xenial-pike
|
|
||||||
nova-cloud-controller:
|
|
||||||
expose: True
|
|
||||||
charm: cs:~openstack-charmers-next/nova-cloud-controller
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
network-manager: Neutron
|
|
||||||
openstack-origin: cloud:xenial-pike
|
|
||||||
nova-compute:
|
|
||||||
charm: cs:~openstack-charmers-next/nova-compute
|
|
||||||
num_units: 2
|
|
||||||
constraints: mem=8G root-disk=20G
|
|
||||||
options:
|
|
||||||
config-flags: default_ephemeral_format=ext4
|
|
||||||
enable-live-migration: true
|
|
||||||
enable-resize: true
|
|
||||||
migration-auth-type: ssh
|
|
||||||
openstack-origin: cloud:xenial-pike
|
|
||||||
neutron-api:
|
|
||||||
charm: cs:~openstack-charmers-next/neutron-api
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
flat-network-providers: physnet1
|
|
||||||
neutron-security-groups: true
|
|
||||||
openstack-origin: cloud:xenial-pike
|
|
||||||
neutron-openvswitch:
|
|
||||||
charm: cs:~openstack-charmers-next/neutron-openvswitch
|
|
||||||
neutron-gateway:
|
|
||||||
charm: cs:~openstack-charmers-next/neutron-gateway
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
bridge-mappings: physnet1:br-ex
|
|
||||||
openstack-origin: cloud:xenial-pike
|
|
||||||
relations:
|
|
||||||
- - ceph-osd:mon
|
|
||||||
- ceph-mon:osd
|
|
||||||
- - ceph-mon:mds
|
|
||||||
- ceph-fs:ceph-mds
|
|
||||||
- - nova-compute:amqp
|
|
||||||
- rabbitmq-server:amqp
|
|
||||||
- - nova-compute:image-service
|
|
||||||
- glance:image-service
|
|
||||||
- - keystone:shared-db
|
|
||||||
- percona-cluster:shared-db
|
|
||||||
- - glance:shared-db
|
|
||||||
- percona-cluster:shared-db
|
|
||||||
- - glance:identity-service
|
|
||||||
- keystone:identity-service
|
|
||||||
- - glance:amqp
|
|
||||||
- rabbitmq-server:amqp
|
|
||||||
- - nova-cloud-controller:shared-db
|
|
||||||
- percona-cluster:shared-db
|
|
||||||
- - nova-cloud-controller:identity-service
|
|
||||||
- keystone:identity-service
|
|
||||||
- - nova-cloud-controller:amqp
|
|
||||||
- rabbitmq-server:amqp
|
|
||||||
- - nova-cloud-controller:cloud-compute
|
|
||||||
- nova-compute:cloud-compute
|
|
||||||
- - nova-cloud-controller:image-service
|
|
||||||
- glance:image-service
|
|
||||||
- - 'neutron-api:shared-db'
|
|
||||||
- 'percona-cluster:shared-db'
|
|
||||||
- - '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'
|
|
||||||
- - 'nova-compute:neutron-plugin'
|
|
||||||
- 'neutron-openvswitch:neutron-plugin'
|
|
||||||
- - 'neutron-gateway:amqp'
|
|
||||||
- 'rabbitmq-server:amqp'
|
|
||||||
- - 'neutron-openvswitch:amqp'
|
|
||||||
- 'rabbitmq-server:amqp'
|
|
||||||
- - 'nova-cloud-controller:quantum-network-service'
|
|
||||||
- 'neutron-gateway:quantum-network-service'
|
|
|
@ -1,127 +0,0 @@
|
||||||
series: xenial
|
|
||||||
applications:
|
|
||||||
ceph-fs:
|
|
||||||
charm: ceph-fs
|
|
||||||
series: xenial
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
source: cloud:xenial-queens
|
|
||||||
ceph-osd:
|
|
||||||
charm: cs:~openstack-charmers-next/ceph-osd
|
|
||||||
num_units: 3
|
|
||||||
storage:
|
|
||||||
osd-devices: 'cinder,10G'
|
|
||||||
options:
|
|
||||||
osd-devices: '/srv/ceph /dev/test-non-existent'
|
|
||||||
source: cloud:xenial-queens
|
|
||||||
ceph-mon:
|
|
||||||
charm: cs:~openstack-charmers-next/ceph-mon
|
|
||||||
num_units: 3
|
|
||||||
options:
|
|
||||||
monitor-count: '3'
|
|
||||||
source: cloud:xenial-queens
|
|
||||||
percona-cluster:
|
|
||||||
charm: cs:~openstack-charmers-next/percona-cluster
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
dataset-size: 25%
|
|
||||||
max-connections: 1000
|
|
||||||
source: cloud:xenial-queens
|
|
||||||
rabbitmq-server:
|
|
||||||
charm: cs:~openstack-charmers-next/rabbitmq-server
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
source: cloud:xenial-queens
|
|
||||||
keystone:
|
|
||||||
expose: True
|
|
||||||
charm: cs:~openstack-charmers-next/keystone
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
openstack-origin: cloud:xenial-queens
|
|
||||||
glance:
|
|
||||||
expose: True
|
|
||||||
charm: cs:~openstack-charmers-next/glance
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
openstack-origin: cloud:xenial-queens
|
|
||||||
nova-cloud-controller:
|
|
||||||
expose: True
|
|
||||||
charm: cs:~openstack-charmers-next/nova-cloud-controller
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
network-manager: Neutron
|
|
||||||
openstack-origin: cloud:xenial-queens
|
|
||||||
nova-compute:
|
|
||||||
charm: cs:~openstack-charmers-next/nova-compute
|
|
||||||
num_units: 2
|
|
||||||
constraints: mem=8G
|
|
||||||
options:
|
|
||||||
config-flags: default_ephemeral_format=ext4
|
|
||||||
enable-live-migration: true
|
|
||||||
enable-resize: true
|
|
||||||
migration-auth-type: ssh
|
|
||||||
openstack-origin: cloud:xenial-queens
|
|
||||||
neutron-api:
|
|
||||||
charm: cs:~openstack-charmers-next/neutron-api
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
flat-network-providers: physnet1
|
|
||||||
neutron-security-groups: true
|
|
||||||
openstack-origin: cloud:xenial-queens
|
|
||||||
neutron-openvswitch:
|
|
||||||
charm: cs:~openstack-charmers-next/neutron-openvswitch
|
|
||||||
neutron-gateway:
|
|
||||||
charm: cs:~openstack-charmers-next/neutron-gateway
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
bridge-mappings: physnet1:br-ex
|
|
||||||
openstack-origin: cloud:xenial-queens
|
|
||||||
relations:
|
|
||||||
- - ceph-mon:mds
|
|
||||||
- ceph-fs:ceph-mds
|
|
||||||
- - nova-compute:amqp
|
|
||||||
- rabbitmq-server:amqp
|
|
||||||
- - nova-compute:image-service
|
|
||||||
- glance:image-service
|
|
||||||
- - nova-compute:ceph
|
|
||||||
- ceph-mon:client
|
|
||||||
- - keystone:shared-db
|
|
||||||
- percona-cluster:shared-db
|
|
||||||
- - glance:shared-db
|
|
||||||
- percona-cluster:shared-db
|
|
||||||
- - glance:identity-service
|
|
||||||
- keystone:identity-service
|
|
||||||
- - glance:amqp
|
|
||||||
- rabbitmq-server:amqp
|
|
||||||
- - glance:ceph
|
|
||||||
- ceph-mon:client
|
|
||||||
- - ceph-osd:mon
|
|
||||||
- ceph-mon:osd
|
|
||||||
- - nova-cloud-controller:shared-db
|
|
||||||
- percona-cluster:shared-db
|
|
||||||
- - nova-cloud-controller:identity-service
|
|
||||||
- keystone:identity-service
|
|
||||||
- - nova-cloud-controller:amqp
|
|
||||||
- rabbitmq-server:amqp
|
|
||||||
- - nova-cloud-controller:cloud-compute
|
|
||||||
- nova-compute:cloud-compute
|
|
||||||
- - nova-cloud-controller:image-service
|
|
||||||
- glance:image-service
|
|
||||||
- - 'neutron-api:shared-db'
|
|
||||||
- 'percona-cluster:shared-db'
|
|
||||||
- - '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'
|
|
||||||
- - 'nova-compute:neutron-plugin'
|
|
||||||
- 'neutron-openvswitch:neutron-plugin'
|
|
||||||
- - 'neutron-gateway:amqp'
|
|
||||||
- 'rabbitmq-server:amqp'
|
|
||||||
- - 'neutron-openvswitch:amqp'
|
|
||||||
- 'rabbitmq-server:amqp'
|
|
||||||
- - 'nova-cloud-controller:quantum-network-service'
|
|
||||||
- 'neutron-gateway:quantum-network-service'
|
|
|
@ -1,44 +1,33 @@
|
||||||
charm_name: ceph-fs
|
charm_name: ceph-fs
|
||||||
gate_bundles:
|
gate_bundles:
|
||||||
- bluestore-compression: groovy-victoria
|
|
||||||
- bluestore-compression: focal-wallaby
|
|
||||||
- bluestore-compression: focal-victoria
|
|
||||||
- bluestore-compression: focal-ussuri
|
|
||||||
- bluestore-compression: bionic-ussuri
|
|
||||||
- bluestore-compression: bionic-train
|
|
||||||
- bluestore-compression: bionic-stein
|
|
||||||
- bluestore-compression: bionic-rocky
|
|
||||||
- bionic-queens
|
- bionic-queens
|
||||||
- xenial-mitaka
|
- bionic-stein
|
||||||
|
- bionic-ussuri
|
||||||
|
- focal-ussuri
|
||||||
|
- focal-victoria
|
||||||
|
- focal-wallaby
|
||||||
|
- focal-xena
|
||||||
|
- hirsute-wallaby
|
||||||
|
- impish-wallaby
|
||||||
dev_bundles:
|
dev_bundles:
|
||||||
- bluestore-compression: impish-xena
|
- bionic-rocky
|
||||||
- bluestore-compression: hirsute-wallaby
|
- bionic-train
|
||||||
- xenial-ocata
|
- focal-yoga
|
||||||
# Xenial-pike is missing because of
|
- jammy-yoga
|
||||||
# https://bugs.launchpad.net/charm-nova-compute/+bug/1862624
|
|
||||||
- xenial-queens
|
|
||||||
smoke_bundles:
|
smoke_bundles:
|
||||||
- bluestore-compression: focal-ussuri
|
- focal-ussuri
|
||||||
configure:
|
configure:
|
||||||
- zaza.openstack.charm_tests.glance.setup.add_lts_image
|
- zaza.openstack.charm_tests.glance.setup.add_lts_image
|
||||||
- zaza.openstack.charm_tests.neutron.setup.basic_overcloud_network
|
- zaza.openstack.charm_tests.neutron.setup.basic_overcloud_network
|
||||||
- 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.keystone.setup.add_demo_user
|
- zaza.openstack.charm_tests.keystone.setup.add_demo_user
|
||||||
- bluestore-compression:
|
|
||||||
- zaza.openstack.charm_tests.glance.setup.add_lts_image
|
|
||||||
- zaza.openstack.charm_tests.neutron.setup.basic_overcloud_network
|
|
||||||
- zaza.openstack.charm_tests.nova.setup.create_flavors
|
|
||||||
- zaza.openstack.charm_tests.nova.setup.manage_ssh_key
|
|
||||||
- zaza.openstack.charm_tests.keystone.setup.add_demo_user
|
|
||||||
tests:
|
tests:
|
||||||
- zaza.openstack.charm_tests.ceph.fs.tests.CephFSTests
|
- zaza.openstack.charm_tests.ceph.fs.tests.CephFSTests
|
||||||
- zaza.openstack.charm_tests.ceph.fs.tests.CharmOperationTest
|
- zaza.openstack.charm_tests.ceph.fs.tests.CharmOperationTest
|
||||||
- bluestore-compression:
|
- zaza.openstack.charm_tests.ceph.tests.BlueStoreCompressionCharmOperation
|
||||||
- zaza.openstack.charm_tests.ceph.fs.tests.CephFSTests
|
|
||||||
- zaza.openstack.charm_tests.ceph.fs.tests.CharmOperationTest
|
|
||||||
- zaza.openstack.charm_tests.ceph.tests.BlueStoreCompressionCharmOperation
|
|
||||||
tests_options:
|
tests_options:
|
||||||
force_deploy:
|
force_deploy:
|
||||||
- hirsute-wallaby
|
- hirsute-wallaby
|
||||||
- impish-xena
|
- impish-xena
|
||||||
|
- jammy-yoga
|
||||||
|
|
|
@ -3,6 +3,8 @@
|
||||||
# choices of *requirements.txt files for OpenStack Charms:
|
# choices of *requirements.txt files for OpenStack Charms:
|
||||||
# https://github.com/openstack-charmers/release-tools
|
# 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
|
setuptools<50.0.0 # https://github.com/pypa/setuptools/commit/04e3df22df840c6bb244e9b27bc56750c44b7c85
|
||||||
|
|
||||||
stestr>=2.2.0
|
stestr>=2.2.0
|
||||||
|
|
5
tox.ini
5
tox.ini
|
@ -75,6 +75,11 @@ basepython = python3.8
|
||||||
deps = -r{toxinidir}/test-requirements.txt
|
deps = -r{toxinidir}/test-requirements.txt
|
||||||
commands = stestr run --slowest {posargs}
|
commands = stestr run --slowest {posargs}
|
||||||
|
|
||||||
|
[testenv:py39]
|
||||||
|
basepython = python3.9
|
||||||
|
deps = -r{toxinidir}/test-requirements.txt
|
||||||
|
commands = stestr run --slowest {posargs}
|
||||||
|
|
||||||
[testenv:pep8]
|
[testenv:pep8]
|
||||||
basepython = python3
|
basepython = python3
|
||||||
deps = flake8==3.9.2
|
deps = flake8==3.9.2
|
||||||
|
|
Loading…
Reference in New Issue