openstack
/
charm-nova-cell-controller
Code Issues Proposed changes

Add Kinetic and Zed support 

* sync charm-helpers to classic charms
* change openstack-origin/source default to zed
* align testing with zed
* add new zed bundles
* add zed bundles to tests.yaml
* add zed tests to osci.yaml and .zuul.yaml
* update build-on and run-on bases
* add bindep.txt for py310
* sync tox.ini and requirements.txt for ruamel
* use charmcraft_channel 2.0/stable
* drop reactive plugin overrides
* move interface/layer env vars to charmcraft.yaml

Change-Id: I2cb698f719106e54b06009f24ea47259419e9cad
This commit is contained in:
Corey Bryant 2022-06-10 20:14:48 +00:00
parent c9f9802fdd
commit 884d6c0ab1
14 changed files with 55 additions and 418 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.zuul.yaml
View File

@ -1,4 +1,4 @@
- project:
templates:
- openstack-python3-charm-yoga-jobs
- openstack-python3-charm-zed-jobs
- openstack-cover-jobs

4
bindep.txt Normal file
View File

@ -0,0 +1,4 @@
libffi-dev [platform:dpkg]
libpq-dev [platform:dpkg]
libxml2-dev [platform:dpkg]
libxslt1-dev [platform:dpkg]

27
charmcraft.yaml
View File

@ -2,32 +2,21 @@ type: charm
parts:
charm:
build-packages:
- tox
- git
- python3-dev
override-build: |
apt-get install ca-certificates -y
tox -e build-reactive
override-stage: |
echo "Copying charm to staging area: $CHARMCRAFT_STAGE"
NAME=$(ls $CHARMCRAFT_PART_BUILD/build/builds)
cp -r $CHARMCRAFT_PART_BUILD/build/builds/$NAME/* $CHARMCRAFT_STAGE/
override-prime: |
# For some reason, the normal priming chokes on the fact that there's a
# hooks directory.
cp -r $CHARMCRAFT_STAGE/* .
source: src/
plugin: reactive
build-snaps:
- charm
build-environment:
- CHARM_INTERFACES_DIR: /root/project/interfaces/
- CHARM_LAYERS_DIR: /root/project/layers/
bases:
- build-on:
- name: ubuntu
channel: "20.04"
channel: "22.04"
architectures:
- amd64
run-on:
- name: ubuntu
channel: "20.04"
architectures: [amd64, s390x, ppc64el, arm64]
- name: ubuntu
channel: "22.04"
architectures: [amd64, s390x, ppc64el, arm64]

5
osci.yaml
View File

@ -1,10 +1,9 @@
- project:
templates:
- charm-unit-jobs-py38
- charm-unit-jobs-py310
- charm-xena-functional-jobs
- charm-yoga-functional-jobs
- charm-zed-functional-jobs
vars:
needs_charm_build: true
charm_build_name: nova-cell-controller
build_type: charmcraft
charmcraft_channel: 2.0/stable

12
requirements.txt
View File

@ -15,16 +15,6 @@ setuptools<50.0.0 # https://github.com/pypa/setuptools/commit/04e3df22df840c6bb
#
cryptography<3.4
# Build requirements
cffi==1.14.6; python_version < '3.6' # cffi 1.15.0 drops support for py35.
git+https://github.com/juju/charm-tools#egg=charm-tools
git+https://github.com/juju/charm-tools.git
simplejson
# Newer versions use keywords that didn't exist in python 3.5 yet (e.g.
# "ModuleNotFoundError")
# NOTE(lourot): This might look like a duplication of test-requirements.txt but
# some tox targets use only test-requirements.txt whereas charm-build uses only
# requirements.txt
importlib-metadata<3.0.0; python_version < '3.6'
importlib-resources<3.0.0; python_version < '3.6'

2
src/config.yaml
View File

@ -14,7 +14,7 @@ options:
Setting this to True will allow supporting services to log to syslog.
openstack-origin:
type: string
default: yoga
default: zed
description: |
Repository from which to install. May be one of the following:
distro (default), ppa:somecustom/ppa, a deb url sources entry,

1
src/metadata.yaml
View File

@ -21,7 +21,6 @@ description: |
tags:
- openstack
series:
- focal
- jammy
extra-bindings:
public:

310
src/tests/bundles/focal-yoga.yaml
View File

@ -1,310 +0,0 @@
variables:
openstack-origin: &openstack-origin cloud:focal-yoga
local_overlay_enabled: False
series: focal
comment:
- 'machines section to decide order of deployment. database sooner = faster'
machines:
'0':
constraints: virt-type=kvm mem=3072M
'1':
constraints: virt-type=kvm mem=3072M
'2':
constraints: virt-type=kvm mem=3072M
'3':
constraints: virt-type=kvm mem=3072M
'4':
constraints: virt-type=kvm mem=3072M
'5':
constraints: virt-type=kvm mem=3072M
'6':
'7':
'8':
'9':
'10':
'11':
'12':
constraints: mem=4096M
'13':
'14':
'15':
'16':
applications:
keystone-mysql-router:
charm: ch:mysql-router
channel: latest/edge
neutron-api-mysql-router:
charm: ch:mysql-router
channel: latest/edge
glance-mysql-router:
charm: ch:mysql-router
channel: latest/edge
nova-cloud-controller-mysql-router:
charm: ch:mysql-router
channel: latest/edge
nova-cell-controller-cell2-mysql-router:
charm: ch:mysql-router
options:
base-port: 3316
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
mysql-innodb-cluster-cell2:
charm: ch:mysql-innodb-cluster
num_units: 3
options:
source: *openstack-origin
to:
- '3'
- '4'
- '5'
channel: latest/edge
glance:
charm: ch:glance
num_units: 1
options:
openstack-origin: *openstack-origin
worker-multiplier: 0.25
to:
- '6'
channel: yoga/edge
keystone:
charm: ch:keystone
num_units: 1
options:
admin-password: openstack
openstack-origin: *openstack-origin
worker-multiplier: 0.25
to:
- '7'
channel: yoga/edge
neutron-api:
charm: ch: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
worker-multiplier: 0.25
to:
- '8'
channel: yoga/edge
neutron-gateway:
charm: ch:neutron-gateway
num_units: 1
options:
bridge-mappings: physnet1:br-ex
openstack-origin: *openstack-origin
worker-multiplier: 0.25
to:
- '9'
channel: yoga/edge
neutron-openvswitch:
charm: ch:neutron-openvswitch
num_units: 0
channel: yoga/edge
nova-cloud-controller:
charm: ch:nova-cloud-controller
num_units: 1
options:
network-manager: Neutron
openstack-origin: *openstack-origin
worker-multiplier: 0.25
debug: true
to:
- '10'
channel: yoga/edge
nova-cell-controller-cell2:
charm: ../../../nova-cell-controller.charm
num_units: 1
options:
openstack-origin: *openstack-origin
worker-multiplier: 0.25
debug: true
cell-name: "cell2"
to:
- '11'
nova-compute-cell2:
charm: ch:nova-compute
num_units: 1
storage:
ephemeral-device: '40G'
options:
enable-live-migration: true
enable-resize: true
migration-auth-type: ssh
openstack-origin: *openstack-origin
debug: true
to:
- '12'
channel: yoga/edge
rabbitmq-server-nova:
charm: ch:rabbitmq-server
num_units: 1
to:
- '13'
channel: latest/edge
rabbitmq-server-nova-cell2:
charm: ch:rabbitmq-server
num_units: 1
to:
- '14'
channel: latest/edge
rabbitmq-server-neutron:
charm: ch:rabbitmq-server
num_units: 1
to:
- '15'
channel: latest/edge
placement:
charm: ch:placement
num_units: 1
options:
openstack-origin: *openstack-origin
debug: true
to:
- '16'
channel: yoga/edge
relations:
- - 'nova-cloud-controller:nova-cell-api'
- 'nova-cell-controller-cell2:nova-cell-compute'
- - 'nova-cloud-controller:shared-db-cell'
- 'nova-cell-controller-cell2-mysql-router:shared-db'
- - 'nova-cloud-controller:amqp-cell'
- 'rabbitmq-server-nova-cell2:amqp'
- - 'nova-compute-cell2:amqp'
- 'rabbitmq-server-nova-cell2:amqp'
- - 'neutron-gateway:amqp'
- 'rabbitmq-server-neutron:amqp'
- - 'neutron-gateway:amqp-nova'
- 'rabbitmq-server-nova:amqp'
- - 'keystone:shared-db'
- 'keystone-mysql-router:shared-db'
- - 'keystone-mysql-router:db-router'
- 'mysql-innodb-cluster:db-router'
- - '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:shared-db'
- 'neutron-api-mysql-router:shared-db'
- - 'neutron-api-mysql-router:db-router'
- 'mysql-innodb-cluster:db-router'
- - 'neutron-api:amqp'
- 'rabbitmq-server-neutron:amqp'
- - 'neutron-gateway:neutron-plugin-api'
- 'neutron-api:neutron-plugin-api'
- - 'glance:shared-db'
- 'glance-mysql-router:shared-db'
- - 'glance-mysql-router:db-router'
- 'mysql-innodb-cluster:db-router'
- - 'glance:amqp'
- 'rabbitmq-server-neutron:amqp'
- - 'nova-cloud-controller:image-service'
- 'glance:image-service'
- - 'nova-compute-cell2:image-service'
- 'glance:image-service'
- - 'nova-cell-controller-cell2:cloud-compute'
- 'nova-compute-cell2:cloud-compute'
- - 'nova-cell-controller-cell2:identity-credentials'
- 'keystone:identity-credentials'
- - 'nova-cloud-controller:amqp'
- 'rabbitmq-server-nova:amqp'
- - 'nova-cell-controller-cell2:amqp'
- 'rabbitmq-server-nova-cell2:amqp'
- - 'nova-cloud-controller:quantum-network-service'
- 'neutron-gateway:quantum-network-service'
- - 'nova-compute-cell2:neutron-plugin'
- 'neutron-openvswitch:neutron-plugin'
- - 'neutron-openvswitch:amqp'
- 'rabbitmq-server-neutron: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-cell-controller-cell2:shared-db'
- 'nova-cell-controller-cell2-mysql-router:shared-db'
- - 'nova-cell-controller-cell2-mysql-router:db-router'
- 'mysql-innodb-cluster-cell2:db-router'
- - 'nova-cloud-controller:neutron-api'
- 'neutron-api:neutron-api'
- - 'nova-compute-cell2:cloud-credentials'
- 'keystone:identity-credentials'
- - 'placement:identity-service'
- 'keystone:identity-service'
- - 'placement:shared-db'
- 'placement-mysql-router:shared-db'
- - 'placement-mysql-router:db-router'
- 'mysql-innodb-cluster:db-router'
- - 'nova-cloud-controller:placement'
- 'placement:placement'

16
src/tests/bundles/jammy-yoga.yaml
View File

@ -87,7 +87,7 @@ applications:
worker-multiplier: 0.25
to:
- '6'
channel: yoga/edge
channel: latest/edge
keystone:
charm: ch:keystone
@ -98,7 +98,7 @@ applications:
worker-multiplier: 0.25
to:
- '7'
channel: yoga/edge
channel: latest/edge
neutron-api:
charm: ch:neutron-api
@ -112,7 +112,7 @@ applications:
worker-multiplier: 0.25
to:
- '8'
channel: yoga/edge
channel: latest/edge
neutron-gateway:
charm: ch:neutron-gateway
@ -123,12 +123,12 @@ applications:
worker-multiplier: 0.25
to:
- '9'
channel: yoga/edge
channel: latest/edge
neutron-openvswitch:
charm: ch:neutron-openvswitch
num_units: 0
channel: yoga/edge
channel: latest/edge
nova-cloud-controller:
charm: ch:nova-cloud-controller
@ -140,7 +140,7 @@ applications:
debug: true
to:
- '10'
channel: yoga/edge
channel: latest/edge
nova-cell-controller-cell2:
charm: ../../../nova-cell-controller.charm
@ -166,7 +166,7 @@ applications:
debug: true
to:
- '12'
channel: yoga/edge
channel: latest/edge
rabbitmq-server-nova:
charm: ch:rabbitmq-server
@ -197,7 +197,7 @@ applications:
debug: true
to:
- '16'
channel: yoga/edge
channel: latest/edge
relations:

20
src/tests/bundles/focal-xena.yaml → src/tests/bundles/jammy-zed.yaml
View File

@ -1,9 +1,9 @@
variables:
openstack-origin: &openstack-origin cloud:focal-xena
openstack-origin: &openstack-origin cloud:jammy-zed
local_overlay_enabled: False
series: focal
series: jammy
comment:
- 'machines section to decide order of deployment. database sooner = faster'
@ -87,7 +87,7 @@ applications:
worker-multiplier: 0.25
to:
- '6'
channel: yoga/edge
channel: latest/edge
keystone:
charm: ch:keystone
@ -98,7 +98,7 @@ applications:
worker-multiplier: 0.25
to:
- '7'
channel: yoga/edge
channel: latest/edge
neutron-api:
charm: ch:neutron-api
@ -112,7 +112,7 @@ applications:
worker-multiplier: 0.25
to:
- '8'
channel: yoga/edge
channel: latest/edge
neutron-gateway:
charm: ch:neutron-gateway
@ -123,12 +123,12 @@ applications:
worker-multiplier: 0.25
to:
- '9'
channel: yoga/edge
channel: latest/edge
neutron-openvswitch:
charm: ch:neutron-openvswitch
num_units: 0
channel: yoga/edge
channel: latest/edge
nova-cloud-controller:
charm: ch:nova-cloud-controller
@ -140,7 +140,7 @@ applications:
debug: true
to:
- '10'
channel: yoga/edge
channel: latest/edge
nova-cell-controller-cell2:
charm: ../../../nova-cell-controller.charm
@ -166,7 +166,7 @@ applications:
debug: true
to:
- '12'
channel: yoga/edge
channel: latest/edge
rabbitmq-server-nova:
charm: ch:rabbitmq-server
@ -197,7 +197,7 @@ applications:
debug: true
to:
- '16'
channel: yoga/edge
channel: latest/edge
relations:

18
src/tests/bundles/impish-xena.yaml → src/tests/bundles/kinetic-zed.yaml
View File

@ -3,7 +3,7 @@ variables:
local_overlay_enabled: False
series: impish
series: kinetic
comment:
- 'machines section to decide order of deployment. database sooner = faster'
@ -87,7 +87,7 @@ applications:
worker-multiplier: 0.25
to:
- '6'
channel: yoga/edge
channel: latest/edge
keystone:
charm: ch:keystone
@ -98,7 +98,7 @@ applications:
worker-multiplier: 0.25
to:
- '7'
channel: yoga/edge
channel: latest/edge
neutron-api:
charm: ch:neutron-api
@ -112,7 +112,7 @@ applications:
worker-multiplier: 0.25
to:
- '8'
channel: yoga/edge
channel: latest/edge
neutron-gateway:
charm: ch:neutron-gateway
@ -123,12 +123,12 @@ applications:
worker-multiplier: 0.25
to:
- '9'
channel: yoga/edge
channel: latest/edge
neutron-openvswitch:
charm: ch:neutron-openvswitch
num_units: 0
channel: yoga/edge
channel: latest/edge
nova-cloud-controller:
charm: ch:nova-cloud-controller
@ -140,7 +140,7 @@ applications:
debug: true
to:
- '10'
channel: yoga/edge
channel: latest/edge
nova-cell-controller-cell2:
charm: ../../../nova-cell-controller.charm
@ -166,7 +166,7 @@ applications:
debug: true
to:
- '12'
channel: yoga/edge
channel: latest/edge
rabbitmq-server-nova:
charm: ch:rabbitmq-server
@ -197,7 +197,7 @@ applications:
debug: true
to:
- '16'
channel: yoga/edge
channel: latest/edge
relations:

15
src/tests/tests.yaml
View File

@ -11,17 +11,16 @@ configure:
- zaza.openstack.charm_tests.nova.setup.manage_ssh_key
gate_bundles:
- focal-xena
- impish-xena
dev_bundles:
- focal-yoga
- jammy-yoga
dev_bundles:
- jammy-yoga
- jammy-zed
- kinetic-zed
smoke_bundles:
- focal-xena
- jammy-yoga
tests_options:
force_deploy:
- impish-xena
- jammy-yoga
- kinetic-zed

18
test-requirements.txt
View File

@ -4,7 +4,6 @@
# 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
@ -13,25 +12,10 @@ stestr>=2.2.0
# https://github.com/mtreinish/stestr/issues/145
cliff<3.0.0
# Dependencies of stestr. Newer versions use keywords that didn't exist in
# python 3.5 yet (e.g. "ModuleNotFoundError")
importlib-metadata<3.0.0; python_version < '3.6'
importlib-resources<3.0.0; python_version < '3.6'
# Some Zuul nodes sometimes pull newer versions of these dependencies which
# dropped support for python 3.5:
osprofiler<2.7.0;python_version<'3.6'
stevedore<1.31.0;python_version<'3.6'
debtcollector<1.22.0;python_version<'3.6'
oslo.utils<=3.41.0;python_version<'3.6'
requests>=2.18.4
charms.reactive
# Newer mock seems to have some syntax which is newer than python3.5 (e.g.
# f'{something}'
mock>=1.2,<4.0.0; python_version < '3.6'
mock>=1.2; python_version >= '3.6'
mock>=1.2
nose>=1.3.7
coverage>=3.6

23
tox.ini
View File

@ -31,10 +31,8 @@ minversion = 3.18.0
setenv = VIRTUAL_ENV={envdir}
PYTHONHASHSEED=0
TERM=linux
LAYER_PATH={toxinidir}/layers
INTERFACE_PATH={toxinidir}/interfaces
JUJU_REPOSITORY={toxinidir}/build
passenv = http_proxy https_proxy INTERFACE_PATH LAYER_PATH JUJU_REPOSITORY
passenv = no_proxy http_proxy https_proxy JUJU_REPOSITORY
install_command =
{toxinidir}/pip.sh install {opts} {packages}
allowlist_externals =
@ -50,7 +48,7 @@ basepython = python3
deps = -r{toxinidir}/build-requirements.txt
commands =
charmcraft clean
charmcraft -v build
charmcraft -v pack
{toxinidir}/rename.sh
[testenv:build-reactive]
@ -68,21 +66,6 @@ basepython = python3
deps = -r{toxinidir}/test-requirements.txt
commands = stestr run --slowest {posargs}
[testenv:py36]
basepython = python3.6
deps = -r{toxinidir}/test-requirements.txt
commands = stestr run --slowest {posargs}
[testenv:py38]
basepython = python3.8
deps = -r{toxinidir}/test-requirements.txt
commands = stestr run --slowest {posargs}
[testenv:py39]
basepython = python3.9
deps = -r{toxinidir}/test-requirements.txt
commands = stestr run --slowest {posargs}
[testenv:py310]
basepython = python3.10
deps = -r{toxinidir}/test-requirements.txt
@ -91,7 +74,7 @@ commands = stestr run --slowest {posargs}
[testenv:pep8]
basepython = python3
deps = flake8==3.9.2
charm-tools==2.8.3
git+https://github.com/juju/charm-tools.git
commands = flake8 {posargs} src unit_tests
[testenv:func-target]