openstack
/
charm-magnum
Code Issues Proposed changes

Updates for testing period for 23.04 release 

* charm-helpers sync for classic charms
* build.lock file for reactive charms
* ensure tox.ini is from release-tools
* Locked requirements using pip-compile:
  * existing (test-)requirements.txt ->
    (test-)requirements.in
  * pip-compile to *-py3[8|10].txt using python3.8
    and python3.10.
  * Updated tox.ini to use the appropriate merged
    requirements-*.txt files.
* Removal of lunar from metadata, charmcraft.yaml
  osci.yaml, tests.yaml and associated bundles.
* Locked libs and tests to stable/bobcat branches for:
  * charm-helpers
  * charms.openstack
  * zaza
  * zaza-openstack-tests

Change-Id: Ib6d60cb8ec3ca7a69466d55847fcb1fca60ee494
This commit is contained in:
Alex Kavanagh 2023-10-17 18:02:36 +01:00
parent f84af75285
commit cb9ef51e54
18 changed files with 1425 additions and 446 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitreview
View File

@ -2,3 +2,5 @@
host=review.opendev.org
port=29418
project=openstack/charm-magnum.git
defaultbranch=stable/2023.2

3
charmcraft.yaml
View File

@ -22,9 +22,6 @@ bases:
- name: ubuntu
channel: "22.04"
architectures: [amd64, s390x, ppc64el, arm64]
- name: ubuntu
channel: "23.04"
architectures: [amd64, s390x, ppc64el, arm64]
- name: ubuntu
channel: "23.10"
architectures: [amd64, s390x, ppc64el, arm64]

202
merged-requirements-py310.txt Normal file
View File

@ -0,0 +1,202 @@
#
# This file is autogenerated by pip-compile with Python 3.10
# by the following command:
#
# pip-compile --output-file=merged-requirements-py310.txt requirements.in test-requirements.in
#
attrs==23.1.0
# via jsonschema
blessings==1.7
# via charm-tools
certifi==2023.7.22
# via requests
cffi==1.16.0
# via cryptography
charm-tools @ git+https://github.com/juju/charm-tools.git
# via -r requirements.in
charmhelpers==1.2.1
# via charms-reactive
charms-openstack @ git+https://github.com/openstack/charms.openstack.git@stable/bobcat
# via -r test-requirements.in
charms-reactive==1.5.2
# via -r test-requirements.in
charset-normalizer==3.3.0
# via requests
cheetah3==3.2.6.post1
# via charm-tools
cliff==2.18.0
# via
# -r test-requirements.in
# stestr
cmd2==0.8.9
# via cliff
colander==1.8.3
# via charm-tools
coverage==7.3.2
# via -r test-requirements.in
cryptography==3.3.2
# via
# -r requirements.in
# -r test-requirements.in
# secretstorage
dict2colander==0.2
# via charm-tools
distlib==0.3.7
# via virtualenv
extras==1.0.0
# via stestr
filelock==3.12.4
# via virtualenv
fixtures==3.0.0
# via
# stestr
# testtools
hvac==1.2.1
# via -r test-requirements.in
idna==3.4
# via requests
importlib-metadata==6.8.0
# via keyring
iso8601==2.1.0
# via
# colander
# python-subunit
jaraco-classes==3.3.0
# via keyring
jeepney==0.8.0
# via
# keyring
# secretstorage
jinja2==3.1.2
# via charmhelpers
jsonschema==4.17.3
# via charm-tools
jujubundlelib==0.5.7
# via charm-tools
keyring==23.13.1
# via charm-tools
lxml==4.9.3
# via -r test-requirements.in
markupsafe==2.1.3
# via jinja2
mock==5.1.0
# via -r test-requirements.in
more-itertools==10.1.0
# via jaraco-classes
netaddr==0.9.0
# via charmhelpers
netifaces==0.11.0
# via -r test-requirements.in
nose==1.3.7
# via -r test-requirements.in
otherstuf==1.1.0
# via charm-tools
parse==1.19.1
# via stuf
path==16.7.1
# via path-py
path-py==12.5.0
# via charm-tools
pathspec==0.10.3
# via charm-tools
pbr==5.6.0
# via
# -r test-requirements.in
# charmhelpers
# cliff
# fixtures
# stestr
# stevedore
# testtools
platformdirs==3.11.0
# via virtualenv
prettytable==0.7.2
# via cliff
psutil==5.9.6
# via -r test-requirements.in
psycopg2-binary==2.9.9
# via -r test-requirements.in
pyaml==23.9.7
# via charms-reactive
pycparser==2.21
# via cffi
pyhcl==0.4.5
# via hvac
pyparsing==2.4.7
# via
# -r test-requirements.in
# cliff
# cmd2
pyperclip==1.8.2
# via cmd2
pyrsistent==0.19.3
# via jsonschema
python-subunit==1.4.3
# via stestr
pyyaml==6.0.1
# via
# charm-tools
# charmhelpers
# cliff
# jujubundlelib
# pyaml
# stestr
requests==2.31.0
# via
# -r test-requirements.in
# charm-tools
# hvac
requirements-parser==0.5.0
# via charm-tools
ruamel-yaml==0.17.35
# via charm-tools
ruamel-yaml-clib==0.2.8
# via ruamel-yaml
secretstorage==3.3.3
# via
# charm-tools
# keyring
simplejson==3.19.2
# via -r requirements.in
six==1.16.0
# via
# blessings
# cliff
# cmd2
# cryptography
# fixtures
stestr==4.1.0
# via -r test-requirements.in
stevedore==5.1.0
# via cliff
stuf==0.9.16
# via otherstuf
tenacity==8.2.3
# via -r test-requirements.in
testtools==2.6.0
# via
# fixtures
# python-subunit
# stestr
tomlkit==0.12.1
# via stestr
translationstring==1.4
# via colander
types-setuptools==68.2.0.0
# via requirements-parser
urllib3==2.0.6
# via requests
vergit==1.0.2
# via charm-tools
virtualenv==20.24.5
# via charm-tools
voluptuous==0.13.1
# via stestr
wcwidth==0.2.8
# via cmd2
zipp==3.17.0
# via importlib-metadata
# The following packages are considered to be unsafe in a requirements file:
# pip
# setuptools

210
merged-requirements-py38.txt Normal file
View File

@ -0,0 +1,210 @@
#
# This file is autogenerated by pip-compile with Python 3.8
# by the following command:
#
# pip-compile --output-file=merged-requirements-py38.txt requirements.in test-requirements.in
#
attrs==23.1.0
# via jsonschema
blessings==1.7
# via charm-tools
certifi==2023.7.22
# via requests
cffi==1.16.0
# via cryptography
charm-tools @ git+https://github.com/juju/charm-tools.git
# via -r requirements.in
charmhelpers==1.2.1
# via charms-reactive
charms-openstack @ git+https://github.com/openstack/charms.openstack.git@stable/bobcat
# via -r test-requirements.in
charms-reactive==1.5.2
# via -r test-requirements.in
charset-normalizer==3.3.0
# via requests
cheetah3==3.2.6.post1
# via charm-tools
cliff==2.18.0
# via
# -r test-requirements.in
# stestr
cmd2==0.8.9
# via cliff
colander==1.8.3
# via charm-tools
coverage==7.3.2
# via -r test-requirements.in
cryptography==3.3.2
# via
# -r requirements.in
# -r test-requirements.in
# secretstorage
dict2colander==0.2
# via charm-tools
distlib==0.3.7
# via virtualenv
extras==1.0.0
# via stestr
filelock==3.12.4
# via virtualenv
fixtures==3.0.0
# via
# stestr
# testtools
hvac==1.2.1
# via -r test-requirements.in
idna==3.4
# via requests
importlib-metadata==6.8.0
# via keyring
importlib-resources==6.1.0
# via
# jsonschema
# keyring
iso8601==2.1.0
# via
# colander
# python-subunit
jaraco-classes==3.3.0
# via keyring
jeepney==0.8.0
# via
# keyring
# secretstorage
jinja2==3.1.2
# via charmhelpers
jsonschema==4.17.3
# via charm-tools
jujubundlelib==0.5.7
# via charm-tools
keyring==23.13.1
# via charm-tools
lxml==4.9.3
# via -r test-requirements.in
markupsafe==2.1.3
# via jinja2
mock==5.1.0
# via -r test-requirements.in
more-itertools==10.1.0
# via jaraco-classes
netaddr==0.9.0
# via charmhelpers
netifaces==0.11.0
# via -r test-requirements.in
nose==1.3.7
# via -r test-requirements.in
otherstuf==1.1.0
# via charm-tools
parse==1.19.1
# via stuf
path==16.7.1
# via path-py
path-py==12.5.0
# via charm-tools
pathspec==0.10.3
# via charm-tools
pbr==5.6.0
# via
# -r test-requirements.in
# charmhelpers
# cliff
# fixtures
# stestr
# stevedore
# testtools
pkgutil-resolve-name==1.3.10
# via jsonschema
platformdirs==3.11.0
# via virtualenv
prettytable==0.7.2
# via cliff
psutil==5.9.6
# via -r test-requirements.in
psycopg2-binary==2.9.9
# via -r test-requirements.in
pyaml==23.9.7
# via charms-reactive
pycparser==2.21
# via cffi
pyhcl==0.4.5
# via hvac
pyparsing==2.4.7
# via
# -r test-requirements.in
# cliff
# cmd2
pyperclip==1.8.2
# via cmd2
pyrsistent==0.19.3
# via jsonschema
python-subunit==1.4.3
# via stestr
pyyaml==6.0.1
# via
# charm-tools
# charmhelpers
# cliff
# jujubundlelib
# pyaml
# stestr
requests==2.31.0
# via
# -r test-requirements.in
# charm-tools
# hvac
requirements-parser==0.5.0
# via charm-tools
ruamel-yaml==0.17.35
# via charm-tools
ruamel-yaml-clib==0.2.8
# via ruamel-yaml
secretstorage==3.3.3
# via
# charm-tools
# keyring
simplejson==3.19.2
# via -r requirements.in
six==1.16.0
# via
# blessings
# cliff
# cmd2
# cryptography
# fixtures
stestr==4.1.0
# via -r test-requirements.in
stevedore==5.1.0
# via cliff
stuf==0.9.16
# via otherstuf
tenacity==8.2.3
# via -r test-requirements.in
testtools==2.6.0
# via
# fixtures
# python-subunit
# stestr
tomlkit==0.12.1
# via stestr
translationstring==1.4
# via colander
types-setuptools==68.2.0.0
# via requirements-parser
urllib3==2.0.6
# via requests
vergit==1.0.2
# via charm-tools
virtualenv==20.24.5
# via charm-tools
voluptuous==0.13.1
# via stestr
wcwidth==0.2.8
# via cmd2
zipp==3.17.0
# via
# importlib-metadata
# importlib-resources
# The following packages are considered to be unsafe in a requirements file:
# pip
# setuptools

0
requirements.txt → requirements.in
View File

262
src/build.lock Normal file
View File

@ -0,0 +1,262 @@
{
"locks": [
{
"type": "layer",
"item": "layer:options",
"url": "https://github.com/juju-solutions/layer-options.git",
"vcs": null,
"branch": "fcdcea4e5de3e1556c24e6704607862d0ba00a56",
"commit": "fcdcea4e5de3e1556c24e6704607862d0ba00a56"
},
{
"type": "layer",
"item": "layer:basic",
"url": "https://github.com/juju-solutions/layer-basic.git",
"vcs": null,
"branch": "23e978fe2872c30511f34ad30a284e34f800e20f",
"commit": "23e978fe2872c30511f34ad30a284e34f800e20f"
},
{
"type": "layer",
"item": "layer:openstack",
"url": "https://github.com/openstack/charm-layer-openstack",
"vcs": null,
"branch": "1c9e662d78b328c6d4587171ccba08572e8dcf25",
"commit": "1c9e662d78b328c6d4587171ccba08572e8dcf25"
},
{
"type": "layer",
"item": "layer:openstack-principle",
"url": "https://github.com/openstack/charm-layer-openstack-principle",
"vcs": null,
"branch": "2541283a7f9c3fa923c0fccd7257e217e11dadcd",
"commit": "2541283a7f9c3fa923c0fccd7257e217e11dadcd"
},
{
"type": "layer",
"item": "layer:openstack-api",
"url": "https://github.com/openstack/charm-layer-openstack-api",
"vcs": null,
"branch": "34311a62e963d0ce903b7ddb9d70b8f071f71651",
"commit": "34311a62e963d0ce903b7ddb9d70b8f071f71651"
},
{
"type": "layer",
"item": "layer:leadership",
"url": "https://git.launchpad.net/layer-leadership",
"vcs": null,
"branch": "cc5bd3f49b2fa5e6c3ab2336763c313ec8bf083f",
"commit": "cc5bd3f49b2fa5e6c3ab2336763c313ec8bf083f"
},
{
"type": "layer",
"item": "magnum",
"url": null,
"vcs": null,
"branch": null,
"commit": ""
},
{
"type": "layer",
"item": "interface:tls-certificates",
"url": "https://github.com/juju-solutions/interface-tls-certificates",
"vcs": null,
"branch": "3056e1fbc5164190c135b20579ab31c89af0b132",
"commit": "3056e1fbc5164190c135b20579ab31c89af0b132"
},
{
"type": "layer",
"item": "interface:mysql-shared",
"url": "https://github.com/openstack/charm-interface-mysql-shared",
"vcs": null,
"branch": "f90f8c6edce21e4da3a872f0f9d6761730ce025d",
"commit": "f90f8c6edce21e4da3a872f0f9d6761730ce025d"
},
{
"type": "layer",
"item": "interface:rabbitmq",
"url": "https://github.com/openstack/charm-interface-rabbitmq",
"vcs": null,
"branch": "383121fc584d2d3bf9d233eba0d3708398a4c468",
"commit": "383121fc584d2d3bf9d233eba0d3708398a4c468"
},
{
"type": "layer",
"item": "interface:keystone",
"url": "https://github.com/openstack/charm-interface-keystone",
"vcs": null,
"branch": "36ea7b385a569ebabca7184ed4ce8420bb8fa61a",
"commit": "36ea7b385a569ebabca7184ed4ce8420bb8fa61a"
},
{
"type": "layer",
"item": "interface:hacluster",
"url": "https://github.com/openstack/charm-interface-hacluster.git",
"vcs": null,
"branch": "5fc5216f51dcf98530d45e137d55fd94b39d150a",
"commit": "5fc5216f51dcf98530d45e137d55fd94b39d150a"
},
{
"type": "layer",
"item": "interface:openstack-ha",
"url": "https://github.com/openstack/charm-interface-openstack-ha",
"vcs": null,
"branch": "a3b00e5b5fd857d130698c5cfe4b918877f0ab80",
"commit": "a3b00e5b5fd857d130698c5cfe4b918877f0ab80"
},
{
"type": "python_module",
"package": "tomli",
"vcs": null,
"version": "2.0.1"
},
{
"type": "python_module",
"package": "flit_core",
"vcs": null,
"version": "3.9.0"
},
{
"type": "python_module",
"package": "sniffio",
"vcs": null,
"version": "1.3.0"
},
{
"type": "python_module",
"package": "poetry_core",
"vcs": null,
"version": "1.7.0"
},
{
"type": "python_module",
"package": "Cython",
"vcs": null,
"version": "0.29.36"
},
{
"type": "python_module",
"package": "netifaces",
"vcs": null,
"version": "0.11.0"
},
{
"type": "python_module",
"package": "charmhelpers",
"url": "git+https://github.com/juju/charm-helpers.git",
"branch": "stable/bobcat",
"version": "fb4c77601caed98e029811dcb7970f5f36d37042",
"vcs": "git"
},
{
"type": "python_module",
"package": "setuptools",
"vcs": null,
"version": "62.1.0"
},
{
"type": "python_module",
"package": "Jinja2",
"vcs": null,
"version": "3.1.2"
},
{
"type": "python_module",
"package": "idna",
"vcs": null,
"version": "3.4"
},
{
"type": "python_module",
"package": "anyio",
"vcs": null,
"version": "3.6.2"
},
{
"type": "python_module",
"package": "netaddr",
"vcs": null,
"version": "0.7.19"
},
{
"type": "python_module",
"package": "packaging",
"vcs": null,
"version": "23.2"
},
{
"type": "python_module",
"package": "pbr",
"vcs": null,
"version": "5.11.1"
},
{
"type": "python_module",
"package": "dnspython",
"vcs": null,
"version": "2.4.2"
},
{
"type": "python_module",
"package": "pyaml",
"vcs": null,
"version": "21.10.1"
},
{
"type": "python_module",
"package": "flit_scm",
"vcs": null,
"version": "1.7.0"
},
{
"type": "python_module",
"package": "wheel",
"vcs": null,
"version": "0.41.2"
},
{
"type": "python_module",
"package": "charms.reactive",
"vcs": null,
"version": "1.5.2"
},
{
"type": "python_module",
"package": "psutil",
"vcs": null,
"version": "5.9.6"
},
{
"type": "python_module",
"package": "pip",
"vcs": null,
"version": "22.0.4"
},
{
"type": "python_module",
"package": "charms.openstack",
"url": "git+https://github.com/openstack/charms.openstack.git",
"branch": "stable/bobcat",
"version": "70f9e32f057938d8ad5e01da20eabb83d3d34847",
"vcs": "git"
},
{
"type": "python_module",
"package": "MarkupSafe",
"vcs": null,
"version": "2.1.3"
},
{
"type": "python_module",
"package": "PyYAML",
"vcs": null,
"version": "6.0.1"
},
{
"type": "python_module",
"package": "setuptools_scm",
"vcs": null,
"version": "6.4.2"
}
]
}

1
src/metadata.yaml
View File

@ -11,7 +11,6 @@ tags:
- openstack
series:
- jammy
- lunar
- mantic
subordinate: false
requires:

659
src/test-requirements-py38.txt Normal file
View File

@ -0,0 +1,659 @@
#
# This file is autogenerated by pip-compile with Python 3.8
# by the following command:
#
# pip-compile --output-file=src/test-requirements-py38.txt src/test-requirements.in
#
aiohttp==3.8.6
# via
# python-libmaas
# zaza
aiosignal==1.3.1
# via aiohttp
aodhclient==3.3.0
# via zaza-openstack
appdirs==1.4.4
# via
# openstacksdk
# python-ironicclient
argcomplete==3.1.2
# via python-libmaas
async-generator==1.10
# via
# zaza
# zaza-openstack
async-timeout==4.0.3
# via aiohttp
attrs==23.1.0
# via
# aiohttp
# cmd2
# jsonschema
# referencing
autopage==0.5.2
# via cliff
babel==2.13.0
# via
# python-cinderclient
# python-heatclient
# python-manilaclient
# python-neutronclient
# python-novaclient
# python-octaviaclient
# python-openstackclient
bcrypt==4.0.1
# via paramiko
boto3==1.28.64
# via zaza-openstack
botocore==1.31.64
# via
# boto3
# s3transfer
cachetools==5.3.1
# via google-auth
certifi==2023.7.22
# via
# kubernetes
# requests
cffi==1.16.0
# via
# cryptography
# pynacl
charset-normalizer==3.3.0
# via
# aiohttp
# requests
cliff==4.3.0
# via
# aodhclient
# gnocchiclient
# osc-lib
# python-barbicanclient
# python-cloudkittyclient
# python-designateclient
# python-heatclient
# python-ironicclient
# python-neutronclient
# python-octaviaclient
# python-openstackclient
# python-watcherclient
cmd2==2.4.3
# via cliff
colorclass==2.2.2
# via python-libmaas
cryptography==3.3.2
# via
# openstacksdk
# paramiko
# pyopenssl
# python-magnumclient
# trustme
# zaza
# zaza-openstack
debtcollector==2.5.0
# via
# gnocchiclient
# oslo-config
# oslo-context
# oslo-log
# oslo-utils
# python-designateclient
# python-keystoneclient
# python-manilaclient
# python-neutronclient
decorator==5.1.1
# via
# dogpile-cache
# jsonpath-rw
# openstacksdk
# python-magnumclient
dnspython==2.4.2
# via
# pymongo
# zaza-openstack
dogpile-cache==1.2.2
# via
# openstacksdk
# python-ironicclient
fasteners==0.19
# via oslo-concurrency
frozenlist==1.4.0
# via
# aiohttp
# aiosignal
futurist==1.10.0
# via
# gnocchiclient
# zaza-openstack
gnocchiclient==7.0.8
# via zaza-openstack
google-auth==2.23.3
# via kubernetes
hvac==0.6.4
# via
# zaza
# zaza-openstack
idna==3.4
# via
# requests
# trustme
# yarl
importlib-metadata==6.8.0
# via cliff
importlib-resources==6.1.0
# via
# jsonschema
# jsonschema-specifications
iso8601==2.1.0
# via
# gnocchiclient
# keystoneauth1
# openstacksdk
# oslo-utils
# python-ceilometerclient
# python-heatclient
# python-neutronclient
# python-novaclient
jinja2==3.1.2
# via
# zaza
# zaza-openstack
jmespath==1.0.1
# via
# boto3
# botocore
# openstacksdk
jsonpatch==1.33
# via
# openstacksdk
# warlock
jsonpath-rw==1.4.0
# via jsonpath-rw-ext
jsonpath-rw-ext==1.2.2
# via python-cloudkittyclient
jsonpointer==2.4
# via jsonpatch
jsonschema==4.19.1
# via
# python-designateclient
# python-ironicclient
# warlock
jsonschema-specifications==2023.7.1
# via jsonschema
juju==2.9.44.1
# via zaza
juju-wait==2.8.4
# via zaza
jujubundlelib==0.5.7
# via theblues
keystoneauth1==5.3.0
# via
# aodhclient
# gnocchiclient
# openstacksdk
# osc-lib
# python-barbicanclient
# python-ceilometerclient
# python-cinderclient
# python-cloudkittyclient
# python-designateclient
# python-glanceclient
# python-heatclient
# python-ironicclient
# python-keystoneclient
# python-magnumclient
# python-neutronclient
# python-novaclient
# python-octaviaclient
# python-openstackclient
# python-watcherclient
kubernetes==28.1.0
# via juju
lxml==4.9.3
# via zaza-openstack
macaroonbakery==1.3.1
# via
# juju
# python-libmaas
# theblues
markupsafe==2.1.3
# via jinja2
msgpack==1.0.7
# via oslo-serialization
multidict==6.0.4
# via
# aiohttp
# yarl
mypy-extensions==1.0.0
# via typing-inspect
netaddr==0.9.0
# via
# oslo-config
# oslo-utils
# osprofiler
# python-neutronclient
netifaces==0.11.0
# via
# openstacksdk
# oslo-utils
# python-octaviaclient
oauthlib==3.2.2
# via
# kubernetes
# python-libmaas
# requests-oauthlib
openstacksdk==1.5.0
# via
# os-client-config
# osc-lib
# python-ironicclient
# python-openstackclient
os-client-config==2.1.0
# via
# python-cloudkittyclient
# python-magnumclient
# python-neutronclient
os-service-types==1.7.0
# via
# keystoneauth1
# openstacksdk
osc-lib==2.8.1
# via
# aodhclient
# python-cloudkittyclient
# python-designateclient
# python-heatclient
# python-ironicclient
# python-magnumclient
# python-neutronclient
# python-octaviaclient
# python-openstackclient
# python-watcherclient
oslo-concurrency==5.2.0
# via osprofiler
oslo-config==6.11.3
# via
# oslo-concurrency
# oslo-log
# python-keystoneclient
# python-manilaclient
# zaza
# zaza-openstack
oslo-context==5.2.0
# via oslo-log
oslo-i18n==6.1.0
# via
# aodhclient
# osc-lib
# oslo-concurrency
# oslo-config
# oslo-log
# oslo-utils
# python-barbicanclient
# python-ceilometerclient
# python-cinderclient
# python-glanceclient
# python-heatclient
# python-keystoneclient
# python-magnumclient
# python-neutronclient
# python-novaclient
# python-openstackclient
# python-watcherclient
oslo-log==5.3.0
# via
# python-cloudkittyclient
# python-magnumclient
# python-manilaclient
# python-neutronclient
oslo-serialization==5.2.0
# via
# aodhclient
# oslo-log
# osprofiler
# python-barbicanclient
# python-ceilometerclient
# python-designateclient
# python-heatclient
# python-keystoneclient
# python-magnumclient
# python-manilaclient
# python-neutronclient
# python-novaclient
# python-octaviaclient
# python-watcherclient
oslo-utils==6.2.1
# via
# aodhclient
# osc-lib
# oslo-concurrency
# oslo-log
# oslo-serialization
# osprofiler
# python-barbicanclient
# python-ceilometerclient
# python-cinderclient
# python-cloudkittyclient
# python-designateclient
# python-glanceclient
# python-heatclient
# python-ironicclient
# python-keystoneclient
# python-magnumclient
# python-manilaclient
# python-neutronclient
# python-novaclient
# python-octaviaclient
# python-openstackclient
# python-watcherclient
osprofiler==4.1.0
# via aodhclient
packaging==23.2
# via oslo-utils
paramiko==2.12.0
# via juju
pbr==5.11.1
# via
# aodhclient
# futurist
# jsonpath-rw-ext
# keystoneauth1
# openstacksdk
# os-service-types
# osc-lib
# oslo-concurrency
# oslo-context
# oslo-i18n
# oslo-log
# oslo-serialization
# python-barbicanclient
# python-ceilometerclient
# python-cinderclient
# python-cloudkittyclient
# python-designateclient
# python-glanceclient
# python-heatclient
# python-ironicclient
# python-keystoneclient
# python-magnumclient
# python-manilaclient
# python-neutronclient
# python-novaclient
# python-octaviaclient
# python-openstackclient
# python-watcherclient
# stevedore
pika==1.3.2
# via zaza-openstack
pkgutil-resolve-name==1.3.10
# via jsonschema
ply==3.11
# via jsonpath-rw
prettytable==0.7.2
# via
# cliff
# futurist
# osprofiler
# python-ceilometerclient
# python-cinderclient
# python-glanceclient
# python-heatclient
# python-magnumclient
# python-manilaclient
# python-novaclient
protobuf==3.20.3
# via macaroonbakery
pyasn1==0.5.0
# via
# juju
# pyasn1-modules
# rsa
pyasn1-modules==0.3.0
# via google-auth
pycparser==2.21
# via cffi
pyinotify==0.9.6
# via oslo-log
pymacaroons==0.13.0
# via macaroonbakery
pymongo==4.5.0
# via python-libmaas
pynacl==1.5.0
# via
# macaroonbakery
# paramiko
# pymacaroons
pyopenssl==21.0.0
# via
# python-glanceclient
# zaza-openstack
pyparsing==3.1.1
# via
# aodhclient
# oslo-utils
pyperclip==1.8.2
# via cmd2
pyrfc3339==1.1
# via
# juju
# macaroonbakery
python-barbicanclient==4.10.0
# via zaza-openstack
python-ceilometerclient==2.9.0
# via zaza-openstack
python-cinderclient==5.0.2
# via
# python-openstackclient
# zaza-openstack
python-cloudkittyclient==4.8.0
# via zaza-openstack
python-dateutil==2.8.2
# via
# botocore
# gnocchiclient
# kubernetes
# oslo-log
python-designateclient==2.12.0
# via zaza-openstack
python-glanceclient==4.4.0
# via
# python-openstackclient
# zaza-openstack
python-heatclient==1.18.1
# via zaza-openstack
python-ironicclient==5.4.0
# via zaza-openstack
python-keystoneclient==3.21.0
# via
# python-manilaclient
# python-neutronclient
# python-openstackclient
# zaza-openstack
python-libmaas==0.6.8
# via zaza
python-magnumclient==4.2.0
# via zaza-openstack
python-manilaclient==1.29.0
# via zaza-openstack
python-neutronclient==6.14.1
# via
# python-octaviaclient
# zaza-openstack
python-novaclient==15.1.1
# via
# python-openstackclient
# zaza-openstack
python-octaviaclient==1.10.1
# via zaza-openstack
python-openstackclient==4.0.2
# via python-octaviaclient
python-swiftclient==3.8.1
# via
# python-heatclient
# zaza-openstack
python-watcherclient==4.2.0
# via zaza-openstack
pytz==2023.3.post1
# via
# babel
# oslo-serialization
# oslo-utils
# pyrfc3339
# python-libmaas
pyyaml==6.0.1
# via
# cliff
# juju
# juju-wait
# jujubundlelib
# kubernetes
# openstacksdk
# oslo-config
# python-cloudkittyclient
# python-heatclient
# python-ironicclient
# python-libmaas
# python-watcherclient
# zaza
# zaza-openstack
referencing==0.30.2
# via
# jsonschema
# jsonschema-specifications
requests==2.31.0
# via
# hvac
# keystoneauth1
# kubernetes
# macaroonbakery
# oslo-config
# osprofiler
# python-barbicanclient
# python-ceilometerclient
# python-cinderclient
# python-designateclient
# python-glanceclient
# python-heatclient
# python-ironicclient
# python-keystoneclient
# python-magnumclient
# python-manilaclient
# python-neutronclient
# python-octaviaclient
# python-swiftclient
# requests-oauthlib
# theblues
requests-oauthlib==1.3.1
# via kubernetes
requestsexceptions==1.4.0
# via openstacksdk
rfc3986==2.0.0
# via oslo-config
rpds-py==0.10.6
# via
# jsonschema
# referencing
rsa==4.9
# via google-auth
s3transfer==0.7.0
# via boto3
simplejson==3.19.2
# via
# osc-lib
# python-cinderclient
# python-manilaclient
# python-neutronclient
# python-novaclient
six==1.16.0
# via
# cryptography
# futurist
# gnocchiclient
# jsonpath-rw
# kubernetes
# macaroonbakery
# oslo-config
# paramiko
# pymacaroons
# pyopenssl
# python-barbicanclient
# python-ceilometerclient
# python-cinderclient
# python-dateutil
# python-designateclient
# python-heatclient
# python-keystoneclient
# python-manilaclient
# python-neutronclient
# python-novaclient
# python-octaviaclient
# python-openstackclient
# python-swiftclient
# python-watcherclient
stevedore==5.1.0
# via
# cliff
# dogpile-cache
# keystoneauth1
# osc-lib
# oslo-config
# python-ceilometerclient
# python-designateclient
# python-ironicclient
# python-keystoneclient
# python-magnumclient
tenacity==8.2.3
# via
# zaza
# zaza-openstack
terminaltables==3.1.10
# via python-libmaas
theblues==0.5.2
# via juju
toposort==1.10
# via juju
trustme==1.1.0
# via zaza-openstack
typing-extensions==4.8.0
# via
# dogpile-cache
# typing-inspect
typing-inspect==0.9.0
# via juju
tzdata==2023.3
# via
# oslo-serialization
# oslo-utils
ujson==5.8.0
# via gnocchiclient
urllib3==1.26.17
# via
# botocore
# kubernetes
# requests
warlock==2.0.1
# via python-glanceclient
wcwidth==0.2.8
# via cmd2
webob==1.8.7
# via osprofiler
websocket-client==1.6.4
# via kubernetes
websockets==7.0
# via juju
wrapt==1.15.0
# via
# debtcollector
# python-glanceclient
yarl==1.9.2
# via aiohttp
zaza @ git+https://github.com/openstack-charmers/zaza.git@stable/bobcat
# via
# -r src/test-requirements.in
# zaza-openstack
zaza-openstack @ git+https://github.com/openstack-charmers/zaza-openstack-tests.git@stable/bobcat
# via -r src/test-requirements.in
zipp==3.17.0
# via
# importlib-metadata
# importlib-resources

4
src/test-requirements.txt → src/test-requirements.in
View File

@ -5,5 +5,5 @@
#
# Functional Test Requirements (let Zaza's dependencies solve all dependencies here!)
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.git@stable/bobcat#egg=zaza
git+https://github.com/openstack-charmers/zaza-openstack-tests.git@stable/bobcat#egg=zaza.openstack

46
src/tests/bundles/jammy-antelope.yaml
View File

@ -38,31 +38,31 @@ applications:
nova-cloud-controller-mysql-router:
charm: ch:mysql-router
channel: latest/edge
channel: 8.0/edge
neutron-api-mysql-router:
charm: ch:mysql-router
channel: latest/edge
channel: 8.0/edge
keystone-mysql-router:
charm: ch:mysql-router
channel: latest/edge
channel: 8.0/edge
glance-mysql-router:
charm: ch:mysql-router
channel: latest/edge
channel: 8.0/edge
placement-mysql-router:
charm: ch:mysql-router
channel: latest/edge
channel: 8.0/edge
vault-mysql-router:
charm: ch:mysql-router
channel: latest/edge
channel: 8.0/edge
magnum-mysql-router:
charm: ch:mysql-router
channel: latest/edge
channel: 8.0/edge
heat-mysql-router:
charm: ch:mysql-router
channel: latest/edge
channel: 8.0/edge
barbican-mysql-router:
charm: ch:mysql-router
channel: latest/edge
channel: 8.0/edge
mysql-innodb-cluster:
charm: ch:mysql-innodb-cluster
@ -73,14 +73,14 @@ applications:
- '0'
- '1'
- '2'
channel: latest/edge
channel: 8.0/edge
rabbitmq-server:
charm: ch:rabbitmq-server
num_units: 1
to:
- '3'
channel: latest/edge
channel: 3.9/edge
nova-cloud-controller:
charm: ch:nova-cloud-controller
@ -90,7 +90,7 @@ applications:
network-manager: Neutron
to:
- '4'
channel: latest/edge
channel: 2023.2/edge
neutron-api:
charm: ch:neutron-api
@ -103,7 +103,7 @@ applications:
neutron-security-groups: true
to:
- '5'
channel: latest/edge
channel: 2023.2/edge
keystone:
charm: ch:keystone
@ -112,7 +112,7 @@ applications:
openstack-origin: *openstack-origin
to:
- '6'
channel: latest/edge
channel: 2023.2/edge
neutron-gateway:
charm: ch:neutron-gateway
@ -122,7 +122,7 @@ applications:
bridge-mappings: physnet1:br-ex
to:
- '7'
channel: latest/edge
channel: 2023.2/edge
glance:
charm: ch:glance
@ -131,11 +131,11 @@ applications:
openstack-origin: *openstack-origin
to:
- '8'
channel: latest/edge
channel: 2023.2/edge
neutron-openvswitch:
charm: ch:neutron-openvswitch
channel: latest/edge
channel: 2023.2/edge
placement:
charm: ch:placement
@ -144,7 +144,7 @@ applications:
openstack-origin: *openstack-origin
to:
- '9'
channel: latest/edge
channel: 2023.2/edge
nova-compute:
charm: ch:nova-compute
@ -156,14 +156,14 @@ applications:
to:
- '10'
- '11'
channel: latest/edge
channel: 2023.2/edge
vault:
charm: ch:vault
num_units: 1
to:
- '12'
channel: latest/edge
channel: 1.8/edge
magnum:
charm: ../../../magnum.charm
@ -181,7 +181,7 @@ applications:
options:
corosync_transport: unicast
cluster_count: 3
channel: latest/edge
channel: 2.4/edge
heat:
charm: ch:heat
@ -190,7 +190,7 @@ applications:
openstack-origin: *openstack-origin
to:
- '16'
channel: latest/edge
channel: 2023.2/edge
barbican:
charm: ch:barbican
@ -199,7 +199,7 @@ applications:
openstack-origin: *openstack-origin
to:
- '17'
channel: latest/edge
channel: 2023.2/edge
relations:

46
src/tests/bundles/jammy-bobcat.yaml
View File

@ -38,31 +38,31 @@ applications:
nova-cloud-controller-mysql-router:
charm: ch:mysql-router
channel: latest/edge
channel: 8.0/edge
neutron-api-mysql-router:
charm: ch:mysql-router
channel: latest/edge
channel: 8.0/edge
keystone-mysql-router:
charm: ch:mysql-router
channel: latest/edge
channel: 8.0/edge
glance-mysql-router:
charm: ch:mysql-router
channel: latest/edge
channel: 8.0/edge
placement-mysql-router:
charm: ch:mysql-router
channel: latest/edge
channel: 8.0/edge
vault-mysql-router:
charm: ch:mysql-router
channel: latest/edge
channel: 8.0/edge
magnum-mysql-router:
charm: ch:mysql-router
channel: latest/edge
channel: 8.0/edge
heat-mysql-router:
charm: ch:mysql-router
channel: latest/edge
channel: 8.0/edge
barbican-mysql-router:
charm: ch:mysql-router
channel: latest/edge
channel: 8.0/edge
mysql-innodb-cluster:
charm: ch:mysql-innodb-cluster
@ -73,14 +73,14 @@ applications:
- '0'
- '1'
- '2'
channel: latest/edge
channel: 8.0/edge
rabbitmq-server:
charm: ch:rabbitmq-server
num_units: 1
to:
- '3'
channel: latest/edge
channel: 3.9/edge
nova-cloud-controller:
charm: ch:nova-cloud-controller
@ -90,7 +90,7 @@ applications:
network-manager: Neutron
to:
- '4'
channel: latest/edge
channel: 2023.2/edge
neutron-api:
charm: ch:neutron-api
@ -103,7 +103,7 @@ applications:
neutron-security-groups: true
to:
- '5'
channel: latest/edge
channel: 2023.2/edge
keystone:
charm: ch:keystone
@ -112,7 +112,7 @@ applications:
openstack-origin: *openstack-origin
to:
- '6'
channel: latest/edge
channel: 2023.2/edge
neutron-gateway:
charm: ch:neutron-gateway
@ -122,7 +122,7 @@ applications:
bridge-mappings: physnet1:br-ex
to:
- '7'
channel: latest/edge
channel: 2023.2/edge
glance:
charm: ch:glance
@ -131,11 +131,11 @@ applications:
openstack-origin: *openstack-origin
to:
- '8'
channel: latest/edge
channel: 2023.2/edge
neutron-openvswitch:
charm: ch:neutron-openvswitch
channel: latest/edge
channel: 2023.2/edge
placement:
charm: ch:placement
@ -144,7 +144,7 @@ applications:
openstack-origin: *openstack-origin
to:
- '9'
channel: latest/edge
channel: 2023.2/edge
nova-compute:
charm: ch:nova-compute
@ -156,14 +156,14 @@ applications:
to:
- '10'
- '11'
channel: latest/edge
channel: 2023.2/edge
vault:
charm: ch:vault
num_units: 1
to:
- '12'
channel: latest/edge
channel: 1.8/edge
magnum:
charm: ../../../magnum.charm
@ -181,7 +181,7 @@ applications:
options:
corosync_transport: unicast
cluster_count: 3
channel: latest/edge
channel: 2.4/edge
heat:
charm: ch:heat
@ -190,7 +190,7 @@ applications:
openstack-origin: *openstack-origin
to:
- '16'
channel: latest/edge
channel: 2023.2/edge
barbican:
charm: ch:barbican
@ -199,7 +199,7 @@ applications:
openstack-origin: *openstack-origin
to:
- '17'
channel: latest/edge
channel: 2023.2/edge
relations:

344
src/tests/bundles/lunar-antelope.yaml
View File

@ -1,344 +0,0 @@
variables:
openstack-origin: &openstack-origin distro
local_overlay_enabled: True
series: lunar
comment:
- 'machines section to decide order of deployment. database sooner = faster'
machines:
'0':
constraints: mem=3072M
'1':
constraints: mem=3072M
'2':
constraints: mem=3072M
'3':
'4':
'5':
'6':
'7':
'8':
'9':
# the following machines are for nova-compute which needs more memory
# for the instances.
'10':
constraints: mem=4096M cores=4
'11':
constraints: mem=4096M cores=4
'12':
'13':
'14':
'15':
'16':
'17':
applications:
nova-cloud-controller-mysql-router:
charm: ch:mysql-router
channel: latest/edge
neutron-api-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
placement-mysql-router:
charm: ch:mysql-router
channel: latest/edge
vault-mysql-router:
charm: ch:mysql-router
channel: latest/edge
magnum-mysql-router:
charm: ch:mysql-router
channel: latest/edge
heat-mysql-router:
charm: ch:mysql-router
channel: latest/edge
barbican-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
to:
- '3'
channel: latest/edge
nova-cloud-controller:
charm: ch:nova-cloud-controller
num_units: 1
options:
openstack-origin: *openstack-origin
network-manager: Neutron
to:
- '4'
channel: latest/edge
neutron-api:
charm: ch:neutron-api
num_units: 1
options:
manage-neutron-plugin-legacy-mode: true
neutron-plugin: ovs
openstack-origin: *openstack-origin
flat-network-providers: physnet1
neutron-security-groups: true
to:
- '5'
channel: latest/edge
keystone:
charm: ch:keystone
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '6'
channel: latest/edge
neutron-gateway:
charm: ch:neutron-gateway
num_units: 1
options:
openstack-origin: *openstack-origin
bridge-mappings: physnet1:br-ex
to:
- '7'
channel: latest/edge
glance:
charm: ch:glance
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '8'
channel: latest/edge
neutron-openvswitch:
charm: ch:neutron-openvswitch
channel: latest/edge
placement:
charm: ch:placement
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '9'
channel: latest/edge
nova-compute:
charm: ch:nova-compute
num_units: 2
storage:
ephemeral-device: '40G'
options:
openstack-origin: *openstack-origin
to:
- '10'
- '11'
channel: latest/edge
vault:
charm: ch:vault
num_units: 1
to:
- '12'
channel: latest/edge
magnum:
charm: ../../../magnum.charm
num_units: 3
options:
openstack-origin: *openstack-origin
to:
- '13'
- '14'
- '15'
magnum-hacluster:
charm: ch:hacluster
num_units: 0
options:
corosync_transport: unicast
cluster_count: 3
channel: latest/edge
heat:
charm: ch:heat
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '16'
channel: latest/edge
barbican:
charm: ch:barbican
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '17'
channel: latest/edge
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'
- - 'vault:shared-db'
- 'vault-mysql-router:shared-db'
- - 'vault-mysql-router:db-router'
- 'mysql-innodb-cluster:db-router'
- - 'vault:certificates'
- 'neutron-api:certificates'
- - 'vault:certificates'
- 'glance:certificates'
- - 'vault:certificates'
- 'keystone:certificates'
- - 'vault:certificates'
- 'nova-cloud-controller:certificates'
- - 'vault:certificates'
- 'placement:certificates'
- - 'magnum:shared-db'
- 'magnum-mysql-router:shared-db'
- - 'magnum-mysql-router:db-router'
- 'mysql-innodb-cluster:db-router'
- - 'magnum:amqp'
- 'rabbitmq-server:amqp'
- - 'magnum:identity-service'
- 'keystone:identity-service'
- - 'magnum:certificates'
- 'vault:certificates'
- - 'magnum:ha'
- 'magnum-hacluster:ha'
- - 'heat:amqp'
- 'rabbitmq-server:amqp'
- - 'heat:identity-service'
- 'keystone:identity-service'
- - 'heat:shared-db'
- 'heat-mysql-router:shared-db'
- - 'heat-mysql-router:db-router'
- 'mysql-innodb-cluster:db-router'
- - 'heat:certificates'
- 'vault:certificates'
- - 'barbican:amqp'
- 'rabbitmq-server:amqp'
- - 'barbican:identity-service'
- 'keystone:identity-service'
- - 'barbican:shared-db'
- 'barbican-mysql-router:shared-db'
- - 'barbican-mysql-router:db-router'
- 'mysql-innodb-cluster:db-router'
- - 'barbican:certificates'
- 'vault:certificates'

46
src/tests/bundles/mantic-bobcat.yaml
View File

@ -38,31 +38,31 @@ applications:
nova-cloud-controller-mysql-router:
charm: ch:mysql-router
channel: latest/edge
channel: 8.0/edge
neutron-api-mysql-router:
charm: ch:mysql-router
channel: latest/edge
channel: 8.0/edge
keystone-mysql-router:
charm: ch:mysql-router
channel: latest/edge
channel: 8.0/edge
glance-mysql-router:
charm: ch:mysql-router
channel: latest/edge
channel: 8.0/edge
placement-mysql-router:
charm: ch:mysql-router
channel: latest/edge
channel: 8.0/edge
vault-mysql-router:
charm: ch:mysql-router
channel: latest/edge
channel: 8.0/edge
magnum-mysql-router:
charm: ch:mysql-router
channel: latest/edge
channel: 8.0/edge
heat-mysql-router:
charm: ch:mysql-router
channel: latest/edge
channel: 8.0/edge
barbican-mysql-router:
charm: ch:mysql-router
channel: latest/edge
channel: 8.0/edge
mysql-innodb-cluster:
charm: ch:mysql-innodb-cluster
@ -73,14 +73,14 @@ applications:
- '0'
- '1'
- '2'
channel: latest/edge
channel: 8.0/edge
rabbitmq-server:
charm: ch:rabbitmq-server
num_units: 1
to:
- '3'
channel: latest/edge
channel: 3.9/edge
nova-cloud-controller:
charm: ch:nova-cloud-controller
@ -90,7 +90,7 @@ applications:
network-manager: Neutron
to:
- '4'
channel: latest/edge
channel: 2023.2/edge
neutron-api:
charm: ch:neutron-api
@ -103,7 +103,7 @@ applications:
neutron-security-groups: true
to:
- '5'
channel: latest/edge
channel: 2023.2/edge
keystone:
charm: ch:keystone
@ -112,7 +112,7 @@ applications:
openstack-origin: *openstack-origin
to:
- '6'
channel: latest/edge
channel: 2023.2/edge
neutron-gateway:
charm: ch:neutron-gateway
@ -122,7 +122,7 @@ applications:
bridge-mappings: physnet1:br-ex
to:
- '7'
channel: latest/edge
channel: 2023.2/edge
glance:
charm: ch:glance
@ -131,11 +131,11 @@ applications:
openstack-origin: *openstack-origin
to:
- '8'
channel: latest/edge
channel: 2023.2/edge
neutron-openvswitch:
charm: ch:neutron-openvswitch
channel: latest/edge
channel: 2023.2/edge
placement:
charm: ch:placement
@ -144,7 +144,7 @@ applications:
openstack-origin: *openstack-origin
to:
- '9'
channel: latest/edge
channel: 2023.2/edge
nova-compute:
charm: ch:nova-compute
@ -156,14 +156,14 @@ applications:
to:
- '10'
- '11'
channel: latest/edge
channel: 2023.2/edge
vault:
charm: ch:vault
num_units: 1
to:
- '12'
channel: latest/edge
channel: 1.8/edge
magnum:
charm: ../../../magnum.charm
@ -181,7 +181,7 @@ applications:
options:
corosync_transport: unicast
cluster_count: 3
channel: latest/edge
channel: 2.4/edge
heat:
charm: ch:heat
@ -190,7 +190,7 @@ applications:
openstack-origin: *openstack-origin
to:
- '16'
channel: latest/edge
channel: 2023.2/edge
barbican:
charm: ch:barbican
@ -199,7 +199,7 @@ applications:
openstack-origin: *openstack-origin
to:
- '17'
channel: latest/edge
channel: 2023.2/edge
relations:

2
src/tests/tests.yaml
View File

@ -8,7 +8,6 @@ gate_bundles:
dev_bundles:
- jammy-bobcat
- lunar-antelope
- mantic-bobcat
configure:
@ -37,5 +36,4 @@ target_deploy_status:
tests_options:
force_deploy:
- lunar-antelope
- mantic-bobcat

12
src/tox.ini
View File

@ -25,29 +25,29 @@ passenv =
CS_*
OS_*
TEST_*
deps = -r{toxinidir}/test-requirements.txt
deps = -r{toxinidir}/test-requirements-py38.txt
[testenv:pep8]
basepython = python3
basepython = python3.8
commands = charm-proof
[testenv:func-noop]
basepython = python3
basepython = python3.8
commands =
functest-run-suite --help
[testenv:func]
basepython = python3
basepython = python3.8
commands =
functest-run-suite --keep-model
[testenv:func-smoke]
basepython = python3
basepython = python3.8
commands =
functest-run-suite --keep-model --smoke
[testenv:func-target]
basepython = python3
basepython = python3.8
commands =
functest-run-suite --keep-model --bundle {posargs}

4
src/wheelhouse.txt
View File

@ -1,3 +1,3 @@
git+https://github.com/openstack/charms.openstack.git#egg=charms.openstack
git+https://github.com/openstack/charms.openstack.git@stable/bobcat#egg=charms.openstack
git+https://github.com/juju/charm-helpers.git#egg=charmhelpers
git+https://github.com/juju/charm-helpers.git@stable/bobcat#egg=charmhelpers

2
test-requirements.txt → test-requirements.in
View File

@ -19,7 +19,7 @@ mock>=1.2
nose>=1.3.7
coverage>=3.6
git+https://github.com/openstack/charms.openstack.git#egg=charms.openstack
git+https://github.com/openstack/charms.openstack.git@stable/bobcat#egg=charms.openstack
#
# Revisit for removal / mock improvement:
#

26
tox.ini
View File

@ -35,10 +35,11 @@ allowlist_externals =
tox
{toxinidir}/rename.sh
deps =
-r{toxinidir}/requirements.txt
-r{toxinidir}/merged-requirements-py38.txt
[testenv:build]
basepython = python3
deps =
# charmcraft clean is done to ensure that
# `tox -e build` always performs a clean, repeatable build.
# For faster rebuilds during development,
@ -49,38 +50,31 @@ commands =
{toxinidir}/rename.sh
charmcraft clean
[testenv:build-reactive]
basepython = python3
commands =
charm-build --log-level DEBUG --use-lock-file-branches -o {toxinidir}/build/builds src {posargs}
[testenv:add-build-lock-file]
basepython = python3
commands =
charm-build --log-level DEBUG --write-lock-file -o {toxinidir}/build/builds src {posargs}
[testenv:py3]
basepython = python3
deps = -r{toxinidir}/test-requirements.txt
deps = -r{toxinidir}/merged-requirements-py38.txt
commands = stestr run --slowest {posargs}
[testenv:py38]
basepython = python3.8
deps = -r{toxinidir}/merged-requirements-py38.txt
commands = stestr run --slowest {posargs}
[testenv:py310]
basepython = python3.10
deps = -r{toxinidir}/test-requirements.txt
deps = -r{toxinidir}/merged-requirements-py310.txt
commands = stestr run --slowest {posargs}
[testenv:pep8]
basepython = python3
deps = flake8==3.9.2
git+https://github.com/juju/charm-tools.git
commands = flake8 {posargs} src unit_tests
[testenv:cover]
# Technique based heavily upon
# https://github.com/openstack/nova/blob/master/tox.ini
basepython = python3
deps = -r{toxinidir}/requirements.txt
-r{toxinidir}/test-requirements.txt
deps = -r{toxinidir}/merged-requirements-py310.txt
setenv =
{[testenv]setenv}
PYTHON=coverage run