Merge "Add Kinetic and Zed support"
This commit is contained in:
Zuul
Gerrit Code Review
commit
a60e3ccb4f
@ -1,4 +1,4 @@
|
|||||||
- project:
|
- project:
|
||||||
templates:
|
templates:
|
||||||
- openstack-python3-charm-jobs
|
- openstack-python3-charm-zed-jobs
|
||||||
- openstack-cover-jobs
|
- openstack-cover-jobs
|
||||||
|
|||||||
@ -22,12 +22,10 @@ parts:
|
|||||||
bases:
|
bases:
|
||||||
- build-on:
|
- build-on:
|
||||||
- name: ubuntu
|
- name: ubuntu
|
||||||
channel: "20.04"
|
channel: "22.04"
|
||||||
architectures:
|
architectures:
|
||||||
- amd64
|
- amd64
|
||||||
- s390x
|
|
||||||
- ppc64el
|
|
||||||
- arm64
|
|
||||||
run-on:
|
run-on:
|
||||||
- name: ubuntu
|
- name: ubuntu
|
||||||
channel: "20.04"
|
channel: "22.04"
|
||||||
|
architectures: [amd64, s390x, ppc64el, arm64]
|
||||||
|
|||||||
@ -8,7 +8,6 @@ description: |
|
|||||||
tags:
|
tags:
|
||||||
- openstack
|
- openstack
|
||||||
series:
|
series:
|
||||||
- focal
|
|
||||||
- jammy
|
- jammy
|
||||||
subordinate: true
|
subordinate: true
|
||||||
provides:
|
provides:
|
||||||
|
|||||||
70
osci.yaml
70
osci.yaml
@ -1,73 +1,9 @@
|
|||||||
- project:
|
- project:
|
||||||
templates:
|
templates:
|
||||||
- charm-yoga-unit-jobs
|
- charm-zed-unit-jobs
|
||||||
check:
|
- charm-zed-functional-jobs
|
||||||
jobs:
|
|
||||||
# NOTE(lourot): adding `focal-ussuri` manually to the list here instead
|
|
||||||
# of using `charm-ussuri-functional-jobs` as we don't support Bionic.
|
|
||||||
- jammy-yoga-nvidia-vgpu:
|
|
||||||
voting: false
|
|
||||||
- focal-yoga-nvidia-vgpu
|
|
||||||
- focal-xena-nvidia-vgpu
|
|
||||||
- focal-wallaby-nvidia-vgpu
|
|
||||||
- focal-victoria-nvidia-vgpu
|
|
||||||
- focal-ussuri-nvidia-vgpu
|
|
||||||
vars:
|
vars:
|
||||||
needs_charm_build: true
|
needs_charm_build: true
|
||||||
charm_build_name: nova-compute-nvidia-vgpu
|
charm_build_name: nova-compute-nvidia-vgpu
|
||||||
build_type: charmcraft
|
build_type: charmcraft
|
||||||
|
charmcraft_channel: 2.0/stable
|
||||||
- job:
|
|
||||||
name: jammy-yoga-nvidia-vgpu
|
|
||||||
description: Run a functional test against jammy-yoga
|
|
||||||
parent: func-target
|
|
||||||
dependencies: &smoke-jobs
|
|
||||||
- focal-ussuri-nvidia-vgpu
|
|
||||||
vars:
|
|
||||||
tox_extra_args: jammy-yoga
|
|
||||||
- job:
|
|
||||||
name: focal-yoga-nvidia-vgpu
|
|
||||||
description: Run a functional test against focal-yoga
|
|
||||||
parent: func-target
|
|
||||||
dependencies: *smoke-jobs
|
|
||||||
vars:
|
|
||||||
tox_extra_args: focal-yoga
|
|
||||||
- job:
|
|
||||||
name: focal-xena-nvidia-vgpu
|
|
||||||
description: Run a functional test against focal-xena
|
|
||||||
parent: func-target
|
|
||||||
dependencies: *smoke-jobs
|
|
||||||
vars:
|
|
||||||
tox_extra_args: focal-xena
|
|
||||||
- job:
|
|
||||||
name: focal-wallaby-nvidia-vgpu
|
|
||||||
description: Run a functional test against focal-wallaby
|
|
||||||
parent: func-target
|
|
||||||
dependencies: *smoke-jobs
|
|
||||||
vars:
|
|
||||||
tox_extra_args: focal-wallaby
|
|
||||||
- job:
|
|
||||||
name: focal-victoria-nvidia-vgpu
|
|
||||||
description: Run a functional test against focal-victoria
|
|
||||||
parent: func-target
|
|
||||||
dependencies: *smoke-jobs
|
|
||||||
vars:
|
|
||||||
tox_extra_args: focal-victoria
|
|
||||||
- job:
|
|
||||||
name: focal-ussuri-nvidia-vgpu
|
|
||||||
description: Run a functional test against focal-ussuri
|
|
||||||
parent: func-target
|
|
||||||
dependencies:
|
|
||||||
# The soft dependencies mean that if they are not configured to run
|
|
||||||
# they will be ignored. See
|
|
||||||
# https://github.com/openstack-charmers/zosci-config
|
|
||||||
- charm-build
|
|
||||||
- osci-lint
|
|
||||||
- name: tox-py36
|
|
||||||
soft: true
|
|
||||||
- name: tox-py38
|
|
||||||
soft: true
|
|
||||||
- name: tox-py39
|
|
||||||
soft: true
|
|
||||||
vars:
|
|
||||||
tox_extra_args: focal-ussuri
|
|
||||||
|
|||||||
@ -3,7 +3,7 @@
|
|||||||
# requirements management in charms via bot-control. Thank you.
|
# requirements management in charms via bot-control. Thank you.
|
||||||
coverage>=3.6
|
coverage>=3.6
|
||||||
mock>=1.2
|
mock>=1.2
|
||||||
flake8>=4.0.1; python_version >= '3.6'
|
flake8>=4.0.1
|
||||||
stestr>=2.2.0
|
stestr>=2.2.0
|
||||||
requests>=2.18.4
|
requests>=2.18.4
|
||||||
psutil
|
psutil
|
||||||
@ -13,4 +13,3 @@ git+https://github.com/openstack-charmers/zaza.git#egg=zaza
|
|||||||
git+https://github.com/openstack-charmers/zaza-openstack-tests.git#egg=zaza.openstack
|
git+https://github.com/openstack-charmers/zaza-openstack-tests.git#egg=zaza.openstack
|
||||||
pytz # workaround for 14.04 pip/tox
|
pytz # workaround for 14.04 pip/tox
|
||||||
pyudev # for ceph-* charm unit tests (not mocked?)
|
pyudev # for ceph-* charm unit tests (not mocked?)
|
||||||
cffi==1.14.6; python_version < '3.6' # cffi 1.15.0 drops support for py35.
|
|
||||||
|
|||||||
@ -1,228 +0,0 @@
|
|||||||
local_overlay_enabled: False
|
|
||||||
|
|
||||||
variables:
|
|
||||||
openstack-origin: &openstack-origin cloud:focal-wallaby
|
|
||||||
|
|
||||||
series: focal
|
|
||||||
|
|
||||||
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':
|
|
||||||
constraints: mem=4096M
|
|
||||||
'5':
|
|
||||||
'6':
|
|
||||||
'7':
|
|
||||||
'8':
|
|
||||||
'9':
|
|
||||||
'10':
|
|
||||||
constraints: mem=4096M cores=4
|
|
||||||
|
|
||||||
applications:
|
|
||||||
|
|
||||||
nova-cloud-controller-mysql-router:
|
|
||||||
charm: ch:mysql-router
|
|
||||||
channel: latest/edge
|
|
||||||
keystone-mysql-router:
|
|
||||||
charm: ch:mysql-router
|
|
||||||
channel: latest/edge
|
|
||||||
glance-mysql-router:
|
|
||||||
charm: ch:mysql-router
|
|
||||||
channel: latest/edge
|
|
||||||
neutron-api-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
|
|
||||||
options:
|
|
||||||
source: *openstack-origin
|
|
||||||
to:
|
|
||||||
- '0'
|
|
||||||
- '1'
|
|
||||||
- '2'
|
|
||||||
channel: latest/edge
|
|
||||||
|
|
||||||
rabbitmq-server:
|
|
||||||
charm: ch:rabbitmq-server
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
source: *openstack-origin
|
|
||||||
to:
|
|
||||||
- '3'
|
|
||||||
channel: latest/edge
|
|
||||||
|
|
||||||
nova-cloud-controller:
|
|
||||||
charm: ch:nova-cloud-controller
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
openstack-origin: *openstack-origin
|
|
||||||
network-manager: Neutron
|
|
||||||
debug: true
|
|
||||||
to:
|
|
||||||
- '4'
|
|
||||||
channel: yoga/edge
|
|
||||||
|
|
||||||
neutron-api:
|
|
||||||
charm: ch:neutron-api
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
manage-neutron-plugin-legacy-mode: true
|
|
||||||
openstack-origin: *openstack-origin
|
|
||||||
flat-network-providers: physnet1
|
|
||||||
neutron-security-groups: true
|
|
||||||
to:
|
|
||||||
- '5'
|
|
||||||
channel: yoga/edge
|
|
||||||
|
|
||||||
keystone:
|
|
||||||
charm: ch:keystone
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
openstack-origin: *openstack-origin
|
|
||||||
to:
|
|
||||||
- '6'
|
|
||||||
channel: yoga/edge
|
|
||||||
|
|
||||||
neutron-gateway:
|
|
||||||
charm: ch:neutron-gateway
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
openstack-origin: *openstack-origin
|
|
||||||
bridge-mappings: physnet1:br-ex
|
|
||||||
to:
|
|
||||||
- '7'
|
|
||||||
channel: yoga/edge
|
|
||||||
|
|
||||||
glance:
|
|
||||||
charm: ch:glance
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
openstack-origin: *openstack-origin
|
|
||||||
to:
|
|
||||||
- '8'
|
|
||||||
channel: yoga/edge
|
|
||||||
|
|
||||||
neutron-openvswitch:
|
|
||||||
charm: ch:neutron-openvswitch
|
|
||||||
channel: yoga/edge
|
|
||||||
|
|
||||||
placement:
|
|
||||||
charm: ch:placement
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
openstack-origin: *openstack-origin
|
|
||||||
to:
|
|
||||||
- '9'
|
|
||||||
channel: yoga/edge
|
|
||||||
|
|
||||||
nova-compute:
|
|
||||||
charm: ch:nova-compute
|
|
||||||
num_units: 1
|
|
||||||
storage:
|
|
||||||
ephemeral-device: '40G'
|
|
||||||
options:
|
|
||||||
openstack-origin: *openstack-origin
|
|
||||||
config-flags: auto_assign_floating_ip=False
|
|
||||||
enable-live-migration: false
|
|
||||||
aa-profile-mode: enforce
|
|
||||||
debug: true
|
|
||||||
to:
|
|
||||||
- '10'
|
|
||||||
channel: yoga/edge
|
|
||||||
|
|
||||||
nova-compute-nvidia-vgpu:
|
|
||||||
charm: ../../nova-compute-nvidia-vgpu.charm
|
|
||||||
options:
|
|
||||||
vgpu-device-mappings: "{'nvidia-108': ['0000:c1:00.0']}"
|
|
||||||
|
|
||||||
relations:
|
|
||||||
- - 'nova-compute:image-service'
|
|
||||||
- 'glance:image-service'
|
|
||||||
|
|
||||||
- - 'nova-compute:amqp'
|
|
||||||
- 'rabbitmq-server:amqp'
|
|
||||||
|
|
||||||
- - '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'
|
|
||||||
|
|
||||||
- - 'keystone:shared-db'
|
|
||||||
- 'keystone-mysql-router:shared-db'
|
|
||||||
- - 'keystone-mysql-router:db-router'
|
|
||||||
- 'mysql-innodb-cluster:db-router'
|
|
||||||
|
|
||||||
- - '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'
|
|
||||||
|
|
||||||
- - 'neutron-gateway:amqp'
|
|
||||||
- 'rabbitmq-server:amqp'
|
|
||||||
|
|
||||||
- - 'nova-cloud-controller:quantum-network-service'
|
|
||||||
- 'neutron-gateway:quantum-network-service'
|
|
||||||
|
|
||||||
- - '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:identity-service'
|
|
||||||
- 'keystone:identity-service'
|
|
||||||
|
|
||||||
- - 'nova-compute:neutron-plugin'
|
|
||||||
- 'neutron-openvswitch:neutron-plugin'
|
|
||||||
|
|
||||||
- - 'rabbitmq-server:amqp'
|
|
||||||
- 'neutron-openvswitch:amqp'
|
|
||||||
|
|
||||||
- - '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'
|
|
||||||
|
|
||||||
- - 'nova-compute:nova-vgpu'
|
|
||||||
- 'nova-compute-nvidia-vgpu:nova-vgpu'
|
|
||||||
@ -1,228 +0,0 @@
|
|||||||
local_overlay_enabled: False
|
|
||||||
|
|
||||||
variables:
|
|
||||||
openstack-origin: &openstack-origin cloud:focal-xena
|
|
||||||
|
|
||||||
series: focal
|
|
||||||
|
|
||||||
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':
|
|
||||||
constraints: mem=4096M
|
|
||||||
'5':
|
|
||||||
'6':
|
|
||||||
'7':
|
|
||||||
'8':
|
|
||||||
'9':
|
|
||||||
'10':
|
|
||||||
constraints: mem=4096M cores=4
|
|
||||||
|
|
||||||
applications:
|
|
||||||
|
|
||||||
nova-cloud-controller-mysql-router:
|
|
||||||
charm: ch:mysql-router
|
|
||||||
channel: latest/edge
|
|
||||||
keystone-mysql-router:
|
|
||||||
charm: ch:mysql-router
|
|
||||||
channel: latest/edge
|
|
||||||
glance-mysql-router:
|
|
||||||
charm: ch:mysql-router
|
|
||||||
channel: latest/edge
|
|
||||||
neutron-api-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
|
|
||||||
options:
|
|
||||||
source: *openstack-origin
|
|
||||||
to:
|
|
||||||
- '0'
|
|
||||||
- '1'
|
|
||||||
- '2'
|
|
||||||
channel: latest/edge
|
|
||||||
|
|
||||||
rabbitmq-server:
|
|
||||||
charm: ch:rabbitmq-server
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
source: *openstack-origin
|
|
||||||
to:
|
|
||||||
- '3'
|
|
||||||
channel: latest/edge
|
|
||||||
|
|
||||||
nova-cloud-controller:
|
|
||||||
charm: ch:nova-cloud-controller
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
openstack-origin: *openstack-origin
|
|
||||||
network-manager: Neutron
|
|
||||||
debug: true
|
|
||||||
to:
|
|
||||||
- '4'
|
|
||||||
channel: yoga/edge
|
|
||||||
|
|
||||||
neutron-api:
|
|
||||||
charm: ch:neutron-api
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
manage-neutron-plugin-legacy-mode: true
|
|
||||||
openstack-origin: *openstack-origin
|
|
||||||
flat-network-providers: physnet1
|
|
||||||
neutron-security-groups: true
|
|
||||||
to:
|
|
||||||
- '5'
|
|
||||||
channel: yoga/edge
|
|
||||||
|
|
||||||
keystone:
|
|
||||||
charm: ch:keystone
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
openstack-origin: *openstack-origin
|
|
||||||
to:
|
|
||||||
- '6'
|
|
||||||
channel: yoga/edge
|
|
||||||
|
|
||||||
neutron-gateway:
|
|
||||||
charm: ch:neutron-gateway
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
openstack-origin: *openstack-origin
|
|
||||||
bridge-mappings: physnet1:br-ex
|
|
||||||
to:
|
|
||||||
- '7'
|
|
||||||
channel: yoga/edge
|
|
||||||
|
|
||||||
glance:
|
|
||||||
charm: ch:glance
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
openstack-origin: *openstack-origin
|
|
||||||
to:
|
|
||||||
- '8'
|
|
||||||
channel: yoga/edge
|
|
||||||
|
|
||||||
neutron-openvswitch:
|
|
||||||
charm: ch:neutron-openvswitch
|
|
||||||
channel: yoga/edge
|
|
||||||
|
|
||||||
placement:
|
|
||||||
charm: ch:placement
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
openstack-origin: *openstack-origin
|
|
||||||
to:
|
|
||||||
- '9'
|
|
||||||
channel: yoga/edge
|
|
||||||
|
|
||||||
nova-compute:
|
|
||||||
charm: ch:nova-compute
|
|
||||||
num_units: 1
|
|
||||||
storage:
|
|
||||||
ephemeral-device: '40G'
|
|
||||||
options:
|
|
||||||
openstack-origin: *openstack-origin
|
|
||||||
config-flags: auto_assign_floating_ip=False
|
|
||||||
enable-live-migration: false
|
|
||||||
aa-profile-mode: enforce
|
|
||||||
debug: true
|
|
||||||
to:
|
|
||||||
- '10'
|
|
||||||
channel: yoga/edge
|
|
||||||
|
|
||||||
nova-compute-nvidia-vgpu:
|
|
||||||
charm: ../../nova-compute-nvidia-vgpu.charm
|
|
||||||
options:
|
|
||||||
vgpu-device-mappings: "{'nvidia-108': ['0000:c1:00.0']}"
|
|
||||||
|
|
||||||
relations:
|
|
||||||
- - 'nova-compute:image-service'
|
|
||||||
- 'glance:image-service'
|
|
||||||
|
|
||||||
- - 'nova-compute:amqp'
|
|
||||||
- 'rabbitmq-server:amqp'
|
|
||||||
|
|
||||||
- - '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'
|
|
||||||
|
|
||||||
- - 'keystone:shared-db'
|
|
||||||
- 'keystone-mysql-router:shared-db'
|
|
||||||
- - 'keystone-mysql-router:db-router'
|
|
||||||
- 'mysql-innodb-cluster:db-router'
|
|
||||||
|
|
||||||
- - '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'
|
|
||||||
|
|
||||||
- - 'neutron-gateway:amqp'
|
|
||||||
- 'rabbitmq-server:amqp'
|
|
||||||
|
|
||||||
- - 'nova-cloud-controller:quantum-network-service'
|
|
||||||
- 'neutron-gateway:quantum-network-service'
|
|
||||||
|
|
||||||
- - '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:identity-service'
|
|
||||||
- 'keystone:identity-service'
|
|
||||||
|
|
||||||
- - 'nova-compute:neutron-plugin'
|
|
||||||
- 'neutron-openvswitch:neutron-plugin'
|
|
||||||
|
|
||||||
- - 'rabbitmq-server:amqp'
|
|
||||||
- 'neutron-openvswitch:amqp'
|
|
||||||
|
|
||||||
- - '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'
|
|
||||||
|
|
||||||
- - 'nova-compute:nova-vgpu'
|
|
||||||
- 'nova-compute-nvidia-vgpu:nova-vgpu'
|
|
||||||
@ -1,228 +0,0 @@
|
|||||||
local_overlay_enabled: False
|
|
||||||
|
|
||||||
variables:
|
|
||||||
openstack-origin: &openstack-origin cloud:focal-yoga
|
|
||||||
|
|
||||||
series: focal
|
|
||||||
|
|
||||||
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':
|
|
||||||
constraints: mem=4096M
|
|
||||||
'5':
|
|
||||||
'6':
|
|
||||||
'7':
|
|
||||||
'8':
|
|
||||||
'9':
|
|
||||||
'10':
|
|
||||||
constraints: mem=4096M cores=4
|
|
||||||
|
|
||||||
applications:
|
|
||||||
|
|
||||||
nova-cloud-controller-mysql-router:
|
|
||||||
charm: ch:mysql-router
|
|
||||||
channel: latest/edge
|
|
||||||
keystone-mysql-router:
|
|
||||||
charm: ch:mysql-router
|
|
||||||
channel: latest/edge
|
|
||||||
glance-mysql-router:
|
|
||||||
charm: ch:mysql-router
|
|
||||||
channel: latest/edge
|
|
||||||
neutron-api-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
|
|
||||||
options:
|
|
||||||
source: *openstack-origin
|
|
||||||
to:
|
|
||||||
- '0'
|
|
||||||
- '1'
|
|
||||||
- '2'
|
|
||||||
channel: latest/edge
|
|
||||||
|
|
||||||
rabbitmq-server:
|
|
||||||
charm: ch:rabbitmq-server
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
source: *openstack-origin
|
|
||||||
to:
|
|
||||||
- '3'
|
|
||||||
channel: latest/edge
|
|
||||||
|
|
||||||
nova-cloud-controller:
|
|
||||||
charm: ch:nova-cloud-controller
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
openstack-origin: *openstack-origin
|
|
||||||
network-manager: Neutron
|
|
||||||
debug: true
|
|
||||||
to:
|
|
||||||
- '4'
|
|
||||||
channel: yoga/edge
|
|
||||||
|
|
||||||
neutron-api:
|
|
||||||
charm: ch:neutron-api
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
manage-neutron-plugin-legacy-mode: true
|
|
||||||
openstack-origin: *openstack-origin
|
|
||||||
flat-network-providers: physnet1
|
|
||||||
neutron-security-groups: true
|
|
||||||
to:
|
|
||||||
- '5'
|
|
||||||
channel: yoga/edge
|
|
||||||
|
|
||||||
keystone:
|
|
||||||
charm: ch:keystone
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
openstack-origin: *openstack-origin
|
|
||||||
to:
|
|
||||||
- '6'
|
|
||||||
channel: yoga/edge
|
|
||||||
|
|
||||||
neutron-gateway:
|
|
||||||
charm: ch:neutron-gateway
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
openstack-origin: *openstack-origin
|
|
||||||
bridge-mappings: physnet1:br-ex
|
|
||||||
to:
|
|
||||||
- '7'
|
|
||||||
channel: yoga/edge
|
|
||||||
|
|
||||||
glance:
|
|
||||||
charm: ch:glance
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
openstack-origin: *openstack-origin
|
|
||||||
to:
|
|
||||||
- '8'
|
|
||||||
channel: yoga/edge
|
|
||||||
|
|
||||||
neutron-openvswitch:
|
|
||||||
charm: ch:neutron-openvswitch
|
|
||||||
channel: yoga/edge
|
|
||||||
|
|
||||||
placement:
|
|
||||||
charm: ch:placement
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
openstack-origin: *openstack-origin
|
|
||||||
to:
|
|
||||||
- '9'
|
|
||||||
channel: yoga/edge
|
|
||||||
|
|
||||||
nova-compute:
|
|
||||||
charm: ch:nova-compute
|
|
||||||
num_units: 1
|
|
||||||
storage:
|
|
||||||
ephemeral-device: '40G'
|
|
||||||
options:
|
|
||||||
openstack-origin: *openstack-origin
|
|
||||||
config-flags: auto_assign_floating_ip=False
|
|
||||||
enable-live-migration: false
|
|
||||||
aa-profile-mode: enforce
|
|
||||||
debug: true
|
|
||||||
to:
|
|
||||||
- '10'
|
|
||||||
channel: yoga/edge
|
|
||||||
|
|
||||||
nova-compute-nvidia-vgpu:
|
|
||||||
charm: ../../nova-compute-nvidia-vgpu.charm
|
|
||||||
options:
|
|
||||||
vgpu-device-mappings: "{'nvidia-108': ['0000:c1:00.0']}"
|
|
||||||
|
|
||||||
relations:
|
|
||||||
- - 'nova-compute:image-service'
|
|
||||||
- 'glance:image-service'
|
|
||||||
|
|
||||||
- - 'nova-compute:amqp'
|
|
||||||
- 'rabbitmq-server:amqp'
|
|
||||||
|
|
||||||
- - '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'
|
|
||||||
|
|
||||||
- - 'keystone:shared-db'
|
|
||||||
- 'keystone-mysql-router:shared-db'
|
|
||||||
- - 'keystone-mysql-router:db-router'
|
|
||||||
- 'mysql-innodb-cluster:db-router'
|
|
||||||
|
|
||||||
- - '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'
|
|
||||||
|
|
||||||
- - 'neutron-gateway:amqp'
|
|
||||||
- 'rabbitmq-server:amqp'
|
|
||||||
|
|
||||||
- - 'nova-cloud-controller:quantum-network-service'
|
|
||||||
- 'neutron-gateway:quantum-network-service'
|
|
||||||
|
|
||||||
- - '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:identity-service'
|
|
||||||
- 'keystone:identity-service'
|
|
||||||
|
|
||||||
- - 'nova-compute:neutron-plugin'
|
|
||||||
- 'neutron-openvswitch:neutron-plugin'
|
|
||||||
|
|
||||||
- - 'rabbitmq-server:amqp'
|
|
||||||
- 'neutron-openvswitch:amqp'
|
|
||||||
|
|
||||||
- - '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'
|
|
||||||
|
|
||||||
- - 'nova-compute:nova-vgpu'
|
|
||||||
- 'nova-compute-nvidia-vgpu:nova-vgpu'
|
|
||||||
@ -72,7 +72,7 @@ applications:
|
|||||||
debug: true
|
debug: true
|
||||||
to:
|
to:
|
||||||
- '4'
|
- '4'
|
||||||
channel: yoga/edge
|
channel: latest/edge
|
||||||
|
|
||||||
neutron-api:
|
neutron-api:
|
||||||
charm: ch:neutron-api
|
charm: ch:neutron-api
|
||||||
@ -84,7 +84,7 @@ applications:
|
|||||||
neutron-security-groups: true
|
neutron-security-groups: true
|
||||||
to:
|
to:
|
||||||
- '5'
|
- '5'
|
||||||
channel: yoga/edge
|
channel: latest/edge
|
||||||
|
|
||||||
keystone:
|
keystone:
|
||||||
charm: ch:keystone
|
charm: ch:keystone
|
||||||
@ -93,7 +93,7 @@ applications:
|
|||||||
openstack-origin: *openstack-origin
|
openstack-origin: *openstack-origin
|
||||||
to:
|
to:
|
||||||
- '6'
|
- '6'
|
||||||
channel: yoga/edge
|
channel: latest/edge
|
||||||
|
|
||||||
neutron-gateway:
|
neutron-gateway:
|
||||||
charm: ch:neutron-gateway
|
charm: ch:neutron-gateway
|
||||||
@ -103,7 +103,7 @@ applications:
|
|||||||
bridge-mappings: physnet1:br-ex
|
bridge-mappings: physnet1:br-ex
|
||||||
to:
|
to:
|
||||||
- '7'
|
- '7'
|
||||||
channel: yoga/edge
|
channel: latest/edge
|
||||||
|
|
||||||
glance:
|
glance:
|
||||||
charm: ch:glance
|
charm: ch:glance
|
||||||
@ -112,11 +112,11 @@ applications:
|
|||||||
openstack-origin: *openstack-origin
|
openstack-origin: *openstack-origin
|
||||||
to:
|
to:
|
||||||
- '8'
|
- '8'
|
||||||
channel: yoga/edge
|
channel: latest/edge
|
||||||
|
|
||||||
neutron-openvswitch:
|
neutron-openvswitch:
|
||||||
charm: ch:neutron-openvswitch
|
charm: ch:neutron-openvswitch
|
||||||
channel: yoga/edge
|
channel: latest/edge
|
||||||
|
|
||||||
placement:
|
placement:
|
||||||
charm: ch:placement
|
charm: ch:placement
|
||||||
@ -125,7 +125,7 @@ applications:
|
|||||||
openstack-origin: *openstack-origin
|
openstack-origin: *openstack-origin
|
||||||
to:
|
to:
|
||||||
- '9'
|
- '9'
|
||||||
channel: yoga/edge
|
channel: latest/edge
|
||||||
|
|
||||||
nova-compute:
|
nova-compute:
|
||||||
charm: ch:nova-compute
|
charm: ch:nova-compute
|
||||||
@ -140,7 +140,7 @@ applications:
|
|||||||
debug: true
|
debug: true
|
||||||
to:
|
to:
|
||||||
- '10'
|
- '10'
|
||||||
channel: yoga/edge
|
channel: latest/edge
|
||||||
|
|
||||||
nova-compute-nvidia-vgpu:
|
nova-compute-nvidia-vgpu:
|
||||||
charm: ../../nova-compute-nvidia-vgpu.charm
|
charm: ../../nova-compute-nvidia-vgpu.charm
|
||||||
|
|||||||
@ -1,9 +1,9 @@
|
|||||||
local_overlay_enabled: False
|
local_overlay_enabled: False
|
||||||
|
|
||||||
variables:
|
variables:
|
||||||
openstack-origin: &openstack-origin cloud:focal-victoria
|
openstack-origin: &openstack-origin cloud:jammy-zed
|
||||||
|
|
||||||
series: focal
|
series: jammy
|
||||||
|
|
||||||
comment:
|
comment:
|
||||||
- 'machines section to decide order of deployment. database sooner = faster'
|
- 'machines section to decide order of deployment. database sooner = faster'
|
||||||
@ -72,7 +72,7 @@ applications:
|
|||||||
debug: true
|
debug: true
|
||||||
to:
|
to:
|
||||||
- '4'
|
- '4'
|
||||||
channel: yoga/edge
|
channel: latest/edge
|
||||||
|
|
||||||
neutron-api:
|
neutron-api:
|
||||||
charm: ch:neutron-api
|
charm: ch:neutron-api
|
||||||
@ -84,7 +84,7 @@ applications:
|
|||||||
neutron-security-groups: true
|
neutron-security-groups: true
|
||||||
to:
|
to:
|
||||||
- '5'
|
- '5'
|
||||||
channel: yoga/edge
|
channel: latest/edge
|
||||||
|
|
||||||
keystone:
|
keystone:
|
||||||
charm: ch:keystone
|
charm: ch:keystone
|
||||||
@ -93,7 +93,7 @@ applications:
|
|||||||
openstack-origin: *openstack-origin
|
openstack-origin: *openstack-origin
|
||||||
to:
|
to:
|
||||||
- '6'
|
- '6'
|
||||||
channel: yoga/edge
|
channel: latest/edge
|
||||||
|
|
||||||
neutron-gateway:
|
neutron-gateway:
|
||||||
charm: ch:neutron-gateway
|
charm: ch:neutron-gateway
|
||||||
@ -103,7 +103,7 @@ applications:
|
|||||||
bridge-mappings: physnet1:br-ex
|
bridge-mappings: physnet1:br-ex
|
||||||
to:
|
to:
|
||||||
- '7'
|
- '7'
|
||||||
channel: yoga/edge
|
channel: latest/edge
|
||||||
|
|
||||||
glance:
|
glance:
|
||||||
charm: ch:glance
|
charm: ch:glance
|
||||||
@ -112,11 +112,11 @@ applications:
|
|||||||
openstack-origin: *openstack-origin
|
openstack-origin: *openstack-origin
|
||||||
to:
|
to:
|
||||||
- '8'
|
- '8'
|
||||||
channel: yoga/edge
|
channel: latest/edge
|
||||||
|
|
||||||
neutron-openvswitch:
|
neutron-openvswitch:
|
||||||
charm: ch:neutron-openvswitch
|
charm: ch:neutron-openvswitch
|
||||||
channel: yoga/edge
|
channel: latest/edge
|
||||||
|
|
||||||
placement:
|
placement:
|
||||||
charm: ch:placement
|
charm: ch:placement
|
||||||
@ -125,7 +125,7 @@ applications:
|
|||||||
openstack-origin: *openstack-origin
|
openstack-origin: *openstack-origin
|
||||||
to:
|
to:
|
||||||
- '9'
|
- '9'
|
||||||
channel: yoga/edge
|
channel: latest/edge
|
||||||
|
|
||||||
nova-compute:
|
nova-compute:
|
||||||
charm: ch:nova-compute
|
charm: ch:nova-compute
|
||||||
@ -140,7 +140,7 @@ applications:
|
|||||||
debug: true
|
debug: true
|
||||||
to:
|
to:
|
||||||
- '10'
|
- '10'
|
||||||
channel: yoga/edge
|
channel: latest/edge
|
||||||
|
|
||||||
nova-compute-nvidia-vgpu:
|
nova-compute-nvidia-vgpu:
|
||||||
charm: ../../nova-compute-nvidia-vgpu.charm
|
charm: ../../nova-compute-nvidia-vgpu.charm
|
||||||
@ -3,7 +3,7 @@ local_overlay_enabled: False
|
|||||||
variables:
|
variables:
|
||||||
openstack-origin: &openstack-origin distro
|
openstack-origin: &openstack-origin distro
|
||||||
|
|
||||||
series: focal
|
series: kinetic
|
||||||
|
|
||||||
comment:
|
comment:
|
||||||
- 'machines section to decide order of deployment. database sooner = faster'
|
- 'machines section to decide order of deployment. database sooner = faster'
|
||||||
@ -72,7 +72,7 @@ applications:
|
|||||||
debug: true
|
debug: true
|
||||||
to:
|
to:
|
||||||
- '4'
|
- '4'
|
||||||
channel: yoga/edge
|
channel: latest/edge
|
||||||
|
|
||||||
neutron-api:
|
neutron-api:
|
||||||
charm: ch:neutron-api
|
charm: ch:neutron-api
|
||||||
@ -84,7 +84,7 @@ applications:
|
|||||||
neutron-security-groups: true
|
neutron-security-groups: true
|
||||||
to:
|
to:
|
||||||
- '5'
|
- '5'
|
||||||
channel: yoga/edge
|
channel: latest/edge
|
||||||
|
|
||||||
keystone:
|
keystone:
|
||||||
charm: ch:keystone
|
charm: ch:keystone
|
||||||
@ -93,7 +93,7 @@ applications:
|
|||||||
openstack-origin: *openstack-origin
|
openstack-origin: *openstack-origin
|
||||||
to:
|
to:
|
||||||
- '6'
|
- '6'
|
||||||
channel: yoga/edge
|
channel: latest/edge
|
||||||
|
|
||||||
neutron-gateway:
|
neutron-gateway:
|
||||||
charm: ch:neutron-gateway
|
charm: ch:neutron-gateway
|
||||||
@ -103,7 +103,7 @@ applications:
|
|||||||
bridge-mappings: physnet1:br-ex
|
bridge-mappings: physnet1:br-ex
|
||||||
to:
|
to:
|
||||||
- '7'
|
- '7'
|
||||||
channel: yoga/edge
|
channel: latest/edge
|
||||||
|
|
||||||
glance:
|
glance:
|
||||||
charm: ch:glance
|
charm: ch:glance
|
||||||
@ -112,11 +112,11 @@ applications:
|
|||||||
openstack-origin: *openstack-origin
|
openstack-origin: *openstack-origin
|
||||||
to:
|
to:
|
||||||
- '8'
|
- '8'
|
||||||
channel: yoga/edge
|
channel: latest/edge
|
||||||
|
|
||||||
neutron-openvswitch:
|
neutron-openvswitch:
|
||||||
charm: ch:neutron-openvswitch
|
charm: ch:neutron-openvswitch
|
||||||
channel: yoga/edge
|
channel: latest/edge
|
||||||
|
|
||||||
placement:
|
placement:
|
||||||
charm: ch:placement
|
charm: ch:placement
|
||||||
@ -125,7 +125,7 @@ applications:
|
|||||||
openstack-origin: *openstack-origin
|
openstack-origin: *openstack-origin
|
||||||
to:
|
to:
|
||||||
- '9'
|
- '9'
|
||||||
channel: yoga/edge
|
channel: latest/edge
|
||||||
|
|
||||||
nova-compute:
|
nova-compute:
|
||||||
charm: ch:nova-compute
|
charm: ch:nova-compute
|
||||||
@ -140,7 +140,7 @@ applications:
|
|||||||
debug: true
|
debug: true
|
||||||
to:
|
to:
|
||||||
- '10'
|
- '10'
|
||||||
channel: yoga/edge
|
channel: latest/edge
|
||||||
|
|
||||||
nova-compute-nvidia-vgpu:
|
nova-compute-nvidia-vgpu:
|
||||||
charm: ../../nova-compute-nvidia-vgpu.charm
|
charm: ../../nova-compute-nvidia-vgpu.charm
|
||||||
@ -1,17 +1,15 @@
|
|||||||
charm_name: nova-compute-nvidia-vgpu
|
charm_name: nova-compute-nvidia-vgpu
|
||||||
|
|
||||||
smoke_bundles:
|
smoke_bundles:
|
||||||
- focal-ussuri
|
- jammy-yoga
|
||||||
|
|
||||||
gate_bundles:
|
gate_bundles:
|
||||||
- focal-ussuri
|
- jammy-yoga
|
||||||
- focal-victoria
|
|
||||||
- focal-wallaby
|
|
||||||
- focal-xena
|
|
||||||
- focal-yoga
|
|
||||||
|
|
||||||
dev_bundles:
|
dev_bundles:
|
||||||
- jammy-yoga
|
- jammy-yoga
|
||||||
|
- jammy-zed
|
||||||
|
- kinetic-zed
|
||||||
|
|
||||||
configure:
|
configure:
|
||||||
- zaza.openstack.charm_tests.glance.setup.add_cirros_image
|
- zaza.openstack.charm_tests.glance.setup.add_cirros_image
|
||||||
@ -27,4 +25,4 @@ tests:
|
|||||||
|
|
||||||
tests_options:
|
tests_options:
|
||||||
force_deploy:
|
force_deploy:
|
||||||
- jammy-yoga
|
- kinetic-zed
|
||||||
|
|||||||
7
tox.ini
7
tox.ini
@ -64,6 +64,11 @@ basepython = python3.9
|
|||||||
deps = -r{toxinidir}/requirements.txt
|
deps = -r{toxinidir}/requirements.txt
|
||||||
-r{toxinidir}/test-requirements.txt
|
-r{toxinidir}/test-requirements.txt
|
||||||
|
|
||||||
|
[testenv:py310]
|
||||||
|
basepython = python3.10
|
||||||
|
deps = -r{toxinidir}/requirements.txt
|
||||||
|
-r{toxinidir}/test-requirements.txt
|
||||||
|
|
||||||
[testenv:py3]
|
[testenv:py3]
|
||||||
basepython = python3
|
basepython = python3
|
||||||
deps = -r{toxinidir}/requirements.txt
|
deps = -r{toxinidir}/requirements.txt
|
||||||
@ -117,7 +122,7 @@ deps = -r{toxinidir}/build-requirements.txt
|
|||||||
# the old behaviour we rename the file at the end.
|
# the old behaviour we rename the file at the end.
|
||||||
commands =
|
commands =
|
||||||
charmcraft clean
|
charmcraft clean
|
||||||
charmcraft -v build
|
charmcraft -v pack
|
||||||
{toxinidir}/rename.sh
|
{toxinidir}/rename.sh
|
||||||
|
|
||||||
[testenv:func-noop]
|
[testenv:func-noop]
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user