openstack/charm-manila-ganesha
Code Issues Proposed changes

21.10 - Stable cut of charms for testing period

Browse Source 
* use stable/21.10 libraries
* use zaza/zaza-openstack-tests at stable/21.10
* build.lock files for reactive charms
* bundles refer to ~openstack-charms candidate channel
* update tox/pip.sh to ensure setuptools<50.0.0

Change-Id: I536c02c7b4476b83a33e57289d265b0f558e6611
This commit is contained in:
Alex Kavanagh
2021-10-11 19:07:08 +01:00
parent 090bf5ff5c
commit c243aeb031
19 changed files with 614 additions and 187 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.gitreview
View File

@@ -3,3 +3,5 @@ host=review.opendev.org
port=29418
project=openstack/charm-manila-ganesha.git
defaultbranch=stable/21.10

18
pip.sh Executable file
View File

@@ -0,0 +1,18 @@
#!/usr/bin/env bash
#
# This file is managed centrally by release-tools and should not be modified
# within individual charm repos. See the 'global' dir contents for available
# choices of tox.ini for OpenStack Charms:
# https://github.com/openstack-charmers/release-tools
#
# setuptools 58.0 dropped the support for use_2to3=true which is needed to
# install blessings (an indirect dependency of charm-tools).
#
# More details on the beahvior of tox and virtualenv creation can be found at
# https://github.com/tox-dev/tox/issues/448
#
# This script is wrapper to force the use of the pinned versions early in the
# process when the virtualenv was created and upgraded before installing the
# depedencies declared in the target.
pip install 'pip<20.3' 'setuptools<50.0.0'
pip "$@"

4
requirements.txt
View File

@@ -11,10 +11,6 @@ setuptools<50.0.0 # https://github.com/pypa/setuptools/commit/04e3df22df840c6bb
# Build requirements
charm-tools==2.8.3
# Workaround until https://github.com/juju/charm-tools/pull/589 gets
# published
keyring<21
simplejson
# Newer versions use keywords that didn't exist in python 3.5 yet (e.g.

236
src/build.lock Normal file
View File

@@ -0,0 +1,236 @@
{
"locks": [
{
"type": "layer",
"item": "layer:options",
"url": "https://github.com/juju-solutions/layer-options.git",
"vcs": null,
"branch": "refs/heads/master",
"commit": "fcdcea4e5de3e1556c24e6704607862d0ba00a56"
},
{
"type": "layer",
"item": "layer:basic",
"url": "https://github.com/juju-solutions/layer-basic.git",
"vcs": null,
"branch": "refs/heads/master",
"commit": "a3ff62c32c993d80417f6e093e3ef95e42f62083"
},
{
"type": "layer",
"item": "layer:openstack",
"url": "https://github.com/openstack/charm-layer-openstack",
"vcs": null,
"branch": "refs/heads/master",
"commit": "207bac8bec837edc6a4d6003f51d5b59d2d75adb"
},
{
"type": "layer",
"item": "layer:openstack-principle",
"url": "https://github.com/openstack/charm-layer-openstack-principle",
"vcs": null,
"branch": "refs/heads/master",
"commit": "8100de4b24ab361423363c75599124708169d871"
},
{
"type": "layer",
"item": "layer:openstack-api",
"url": "https://github.com/openstack/charm-layer-openstack-api",
"vcs": null,
"branch": "refs/heads/master",
"commit": "34311a62e963d0ce903b7ddb9d70b8f071f71651"
},
{
"type": "layer",
"item": "manila-ganesha",
"url": null,
"vcs": null,
"branch": "refs/heads/21.10-updates\nrefs/heads/master",
"commit": "refs/heads/21.10-updates\nrefs/heads/master"
},
{
"type": "layer",
"item": "interface:tls-certificates",
"url": "https://github.com/juju-solutions/interface-tls-certificates",
"vcs": null,
"branch": "refs/heads/master",
"commit": "d9850016d930a6d507b9fd45e2598d327922b140"
},
{
"type": "layer",
"item": "interface:mysql-shared",
"url": "https://github.com/openstack/charm-interface-mysql-shared",
"vcs": null,
"branch": "refs/heads/master",
"commit": "06675c43c9f48ffa98b2abf2ddca137f8d18f31c"
},
{
"type": "layer",
"item": "interface:rabbitmq",
"url": "https://github.com/openstack/charm-interface-rabbitmq",
"vcs": null,
"branch": "refs/heads/master",
"commit": "383121fc584d2d3bf9d233eba0d3708398a4c468"
},
{
"type": "layer",
"item": "interface:keystone",
"url": "https://github.com/openstack/charm-interface-keystone",
"vcs": null,
"branch": "refs/heads/master",
"commit": "a48a1e826ac0a74ab05a16c441cda4e4b34b1241"
},
{
"type": "layer",
"item": "interface:hacluster",
"url": "https://github.com/openstack/charm-interface-hacluster.git",
"vcs": null,
"branch": "refs/heads/master",
"commit": "8125a7baecccf9b0869e515b92300dde3a86f31b"
},
{
"type": "layer",
"item": "interface:openstack-ha",
"url": "https://github.com/openstack/charm-interface-openstack-ha",
"vcs": null,
"branch": "refs/heads/master",
"commit": "a3b00e5b5fd857d130698c5cfe4b918877f0ab80"
},
{
"type": "layer",
"item": "interface:ceph-client",
"url": "https://opendev.org/openstack/charm-interface-ceph-client.git",
"vcs": null,
"branch": null,
"commit": "3ca251fb01a7cd51d2a0ee2b9b66647c8ffe891f"
},
{
"type": "layer",
"item": "interface:keystone-credentials",
"url": "https://github.com/openstack/charm-interface-keystone-credentials",
"vcs": null,
"branch": "refs/heads/master",
"commit": "53e93b8820899f2251d207ed5d5c3b212ceb64de"
},
{
"type": "layer",
"item": "interface:manila-plugin",
"url": "https://github.com/openstack/charm-interface-manila-plugin",
"vcs": null,
"branch": "refs/heads/master",
"commit": "14cb348a09b30c92de89878c58e790779ebdad23"
},
{
"type": "python_module",
"package": "Jinja2",
"vcs": null,
"version": "2.10.1"
},
{
"type": "python_module",
"package": "psutil",
"vcs": null,
"version": "5.8.0"
},
{
"type": "python_module",
"package": "setuptools",
"vcs": null,
"version": "41.6.0"
},
{
"type": "python_module",
"package": "pip",
"vcs": null,
"version": "18.1"
},
{
"type": "python_module",
"package": "pbr",
"vcs": null,
"version": "5.6.0"
},
{
"type": "python_module",
"package": "dnspython",
"vcs": null,
"version": "1.16.0"
},
{
"type": "python_module",
"package": "PyYAML",
"vcs": null,
"version": "5.2"
},
{
"type": "python_module",
"package": "setuptools_scm",
"vcs": null,
"version": "1.17.0"
},
{
"type": "python_module",
"package": "netifaces",
"vcs": null,
"version": "0.11.0"
},
{
"type": "python_module",
"package": "MarkupSafe",
"vcs": null,
"version": "1.1.1"
},
{
"type": "python_module",
"package": "Tempita",
"vcs": null,
"version": "0.4"
},
{
"type": "python_module",
"package": "charms.openstack",
"url": "git+https://github.com/openstack/charms.openstack.git",
"branch": "refs/heads/stable/21.10",
"version": "10627ee5f991c268f174d6d100e218a0e1867af1",
"vcs": "git"
},
{
"type": "python_module",
"package": "charms.reactive",
"vcs": null,
"version": "1.4.1"
},
{
"type": "python_module",
"package": "six",
"vcs": null,
"version": "1.16.0"
},
{
"type": "python_module",
"package": "charmhelpers",
"url": "git+https://github.com/juju/charm-helpers.git",
"branch": "refs/heads/stable/21.10",
"version": "26efcd0da51d580f68ead2ca13c38f58766f8a14",
"vcs": "git"
},
{
"type": "python_module",
"package": "netaddr",
"vcs": null,
"version": "0.7.19"
},
{
"type": "python_module",
"package": "wheel",
"vcs": null,
"version": "0.33.6"
},
{
"type": "python_module",
"package": "pyaml",
"vcs": null,
"version": "21.10.1"
}
]
}

10
src/test-requirements.txt
View File

@@ -3,13 +3,7 @@
# choices of *requirements.txt files for OpenStack Charms:
# https://github.com/openstack-charmers/release-tools
#
# pep8 requirements
charm-tools>=2.4.4
# Workaround until https://github.com/juju/charm-tools/pull/589 gets
# published
keyring<21
# 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/21.10#egg=zaza
git+https://github.com/openstack-charmers/zaza-openstack-tests.git@stable/21.10#egg=zaza.openstack

41
src/tests/bundles/bionic-rocky.yaml
View File

@@ -9,38 +9,43 @@ services:
options:
openstack-origin: *source
ceph-mon:
charm: cs:~openstack-charmers-next/ceph-mon
charm: cs:~openstack-charmers/ceph-mon
num_units: 3
options:
source: *source
channel: candidate
ceph-osd:
charm: cs:~openstack-charmers-next/ceph-osd
charm: cs:~openstack-charmers/ceph-osd
num_units: 3
options:
source: *source
storage:
osd-devices: 'cinder,10G'
channel: candidate
ceph-fs:
charm: cs:~openstack-charmers-next/ceph-fs
charm: cs:~openstack-charmers/ceph-fs
num_units: 2
options:
source: *source
channel: candidate
manila:
# charm: cs:~openstack-charmers-next/manila
charm: cs:~openstack-charmers-next/manila
# charm: cs:~openstack-charmers/manila
charm: cs:~openstack-charmers/manila
num_units: 1
options:
openstack-origin: *source
default-share-backend: cephfsnfs1
share-protocols: NFS
channel: candidate
nova-cloud-controller:
charm: cs:~openstack-charmers-next/nova-cloud-controller
charm: cs:~openstack-charmers/nova-cloud-controller
num_units: 1
options:
network-manager: Neutron
openstack-origin: *source
channel: candidate
nova-compute:
charm: cs:~openstack-charmers-next/nova-compute
charm: cs:~openstack-charmers/nova-compute
num_units: 2
constraints: mem=8G
options:
@@ -49,41 +54,49 @@ services:
enable-resize: true
migration-auth-type: ssh
openstack-origin: *source
channel: candidate
glance:
charm: cs:~openstack-charmers-next/glance
charm: cs:~openstack-charmers/glance
num_units: 1
options:
openstack-origin: *source
channel: candidate
neutron-api:
charm: cs:~openstack-charmers-next/neutron-api
charm: cs:~openstack-charmers/neutron-api
num_units: 1
options:
flat-network-providers: physnet1
neutron-security-groups: true
openstack-origin: *source
channel: candidate
neutron-openvswitch:
charm: cs:~openstack-charmers-next/neutron-openvswitch
charm: cs:~openstack-charmers/neutron-openvswitch
channel: candidate
neutron-gateway:
charm: cs:~openstack-charmers-next/neutron-gateway
charm: cs:~openstack-charmers/neutron-gateway
num_units: 1
options:
bridge-mappings: physnet1:br-ex
openstack-origin: *source
channel: candidate
rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server
charm: cs:~openstack-charmers/rabbitmq-server
num_units: 1
options:
source: *source
channel: candidate
percona-cluster:
charm: cs:~openstack-charmers-next/percona-cluster
charm: cs:~openstack-charmers/percona-cluster
num_units: 1
options:
source: *source
channel: candidate
keystone:
charm: cs:~openstack-charmers-next/keystone
charm: cs:~openstack-charmers/keystone
num_units: 1
options:
openstack-origin: *source
channel: candidate
relations:
- - ceph-mon

41
src/tests/bundles/bionic-stein.yaml
View File

@@ -9,38 +9,43 @@ services:
options:
openstack-origin: *source
ceph-mon:
charm: cs:~openstack-charmers-next/ceph-mon
charm: cs:~openstack-charmers/ceph-mon
num_units: 3
options:
source: *source
channel: candidate
ceph-osd:
charm: cs:~openstack-charmers-next/ceph-osd
charm: cs:~openstack-charmers/ceph-osd
num_units: 3
options:
source: *source
storage:
osd-devices: 'cinder,10G'
channel: candidate
ceph-fs:
charm: cs:~openstack-charmers-next/ceph-fs
charm: cs:~openstack-charmers/ceph-fs
num_units: 2
options:
source: *source
channel: candidate
manila:
# charm: cs:~openstack-charmers-next/manila
charm: cs:~openstack-charmers-next/manila
# charm: cs:~openstack-charmers/manila
charm: cs:~openstack-charmers/manila
num_units: 1
options:
openstack-origin: *source
default-share-backend: cephfsnfs1
share-protocols: NFS
channel: candidate
nova-cloud-controller:
charm: cs:~openstack-charmers-next/nova-cloud-controller
charm: cs:~openstack-charmers/nova-cloud-controller
num_units: 1
options:
network-manager: Neutron
openstack-origin: *source
channel: candidate
nova-compute:
charm: cs:~openstack-charmers-next/nova-compute
charm: cs:~openstack-charmers/nova-compute
num_units: 2
constraints: mem=8G
options:
@@ -49,41 +54,49 @@ services:
enable-resize: true
migration-auth-type: ssh
openstack-origin: *source
channel: candidate
glance:
charm: cs:~openstack-charmers-next/glance
charm: cs:~openstack-charmers/glance
num_units: 1
options:
openstack-origin: *source
channel: candidate
neutron-api:
charm: cs:~openstack-charmers-next/neutron-api
charm: cs:~openstack-charmers/neutron-api
num_units: 1
options:
flat-network-providers: physnet1
neutron-security-groups: true
openstack-origin: *source
channel: candidate
neutron-openvswitch:
charm: cs:~openstack-charmers-next/neutron-openvswitch
charm: cs:~openstack-charmers/neutron-openvswitch
channel: candidate
neutron-gateway:
charm: cs:~openstack-charmers-next/neutron-gateway
charm: cs:~openstack-charmers/neutron-gateway
num_units: 1
options:
bridge-mappings: physnet1:br-ex
openstack-origin: *source
channel: candidate
rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server
charm: cs:~openstack-charmers/rabbitmq-server
num_units: 1
options:
source: *source
channel: candidate
percona-cluster:
charm: cs:~openstack-charmers-next/percona-cluster
charm: cs:~openstack-charmers/percona-cluster
num_units: 1
options:
source: *source
channel: candidate
keystone:
charm: cs:~openstack-charmers-next/keystone
charm: cs:~openstack-charmers/keystone
num_units: 1
options:
openstack-origin: *source
channel: candidate
relations:
- - ceph-mon

44
src/tests/bundles/bionic-train.yaml
View File

@@ -9,43 +9,49 @@ services:
options:
openstack-origin: *source
ceph-mon:
charm: cs:~openstack-charmers-next/ceph-mon
charm: cs:~openstack-charmers/ceph-mon
num_units: 3
options:
source: *source
channel: candidate
ceph-osd:
charm: cs:~openstack-charmers-next/ceph-osd
charm: cs:~openstack-charmers/ceph-osd
num_units: 3
options:
source: *source
storage:
osd-devices: 'cinder,10G'
channel: candidate
ceph-fs:
charm: cs:~openstack-charmers-next/ceph-fs
charm: cs:~openstack-charmers/ceph-fs
num_units: 2
options:
source: *source
channel: candidate
manila:
# charm: cs:~openstack-charmers-next/manila
charm: cs:~openstack-charmers-next/manila
# charm: cs:~openstack-charmers/manila
charm: cs:~openstack-charmers/manila
num_units: 1
options:
openstack-origin: *source
default-share-backend: cephfsnfs1
share-protocols: NFS
channel: candidate
nova-cloud-controller:
charm: cs:~openstack-charmers-next/nova-cloud-controller
charm: cs:~openstack-charmers/nova-cloud-controller
num_units: 1
options:
network-manager: Neutron
openstack-origin: *source
channel: candidate
placement:
charm: cs:~openstack-charmers-next/placement
charm: cs:~openstack-charmers/placement
num_units: 1
options:
openstack-origin: *source
channel: candidate
nova-compute:
charm: cs:~openstack-charmers-next/nova-compute
charm: cs:~openstack-charmers/nova-compute
num_units: 2
constraints: mem=8G
options:
@@ -54,41 +60,49 @@ services:
enable-resize: true
migration-auth-type: ssh
openstack-origin: *source
channel: candidate
glance:
charm: cs:~openstack-charmers-next/glance
charm: cs:~openstack-charmers/glance
num_units: 1
options:
openstack-origin: *source
channel: candidate
neutron-api:
charm: cs:~openstack-charmers-next/neutron-api
charm: cs:~openstack-charmers/neutron-api
num_units: 1
options:
flat-network-providers: physnet1
neutron-security-groups: true
openstack-origin: *source
channel: candidate
neutron-openvswitch:
charm: cs:~openstack-charmers-next/neutron-openvswitch
charm: cs:~openstack-charmers/neutron-openvswitch
channel: candidate
neutron-gateway:
charm: cs:~openstack-charmers-next/neutron-gateway
charm: cs:~openstack-charmers/neutron-gateway
num_units: 1
options:
bridge-mappings: physnet1:br-ex
openstack-origin: *source
channel: candidate
rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server
charm: cs:~openstack-charmers/rabbitmq-server
num_units: 1
options:
source: *source
channel: candidate
percona-cluster:
charm: cs:~openstack-charmers-next/percona-cluster
charm: cs:~openstack-charmers/percona-cluster
num_units: 1
options:
source: *source
channel: candidate
keystone:
charm: cs:~openstack-charmers-next/keystone
charm: cs:~openstack-charmers/keystone
num_units: 1
options:
openstack-origin: *source
channel: candidate
relations:
- - ceph-mon

44
src/tests/bundles/bionic-ussuri.yaml
View File

@@ -9,43 +9,49 @@ services:
options:
openstack-origin: *source
ceph-mon:
charm: cs:~openstack-charmers-next/ceph-mon
charm: cs:~openstack-charmers/ceph-mon
num_units: 3
options:
source: *source
channel: candidate
ceph-osd:
charm: cs:~openstack-charmers-next/ceph-osd
charm: cs:~openstack-charmers/ceph-osd
num_units: 3
options:
source: *source
storage:
osd-devices: 'cinder,10G'
channel: candidate
ceph-fs:
charm: cs:~openstack-charmers-next/ceph-fs
charm: cs:~openstack-charmers/ceph-fs
num_units: 2
options:
source: *source
channel: candidate
manila:
# charm: cs:~openstack-charmers-next/manila
charm: cs:~openstack-charmers-next/manila
# charm: cs:~openstack-charmers/manila
charm: cs:~openstack-charmers/manila
num_units: 1
options:
openstack-origin: *source
default-share-backend: cephfsnfs1
share-protocols: NFS
channel: candidate
nova-cloud-controller:
charm: cs:~openstack-charmers-next/nova-cloud-controller
charm: cs:~openstack-charmers/nova-cloud-controller
num_units: 1
options:
network-manager: Neutron
openstack-origin: *source
channel: candidate
placement:
charm: cs:~openstack-charmers-next/placement
charm: cs:~openstack-charmers/placement
num_units: 1
options:
openstack-origin: *source
channel: candidate
nova-compute:
charm: cs:~openstack-charmers-next/nova-compute
charm: cs:~openstack-charmers/nova-compute
num_units: 2
constraints: mem=8G
options:
@@ -54,13 +60,15 @@ services:
enable-resize: true
migration-auth-type: ssh
openstack-origin: *source
channel: candidate
glance:
charm: cs:~openstack-charmers-next/glance
charm: cs:~openstack-charmers/glance
num_units: 1
options:
openstack-origin: *source
channel: candidate
neutron-api:
charm: cs:~openstack-charmers-next/neutron-api
charm: cs:~openstack-charmers/neutron-api
num_units: 1
options:
manage-neutron-plugin-legacy-mode: true
@@ -68,29 +76,35 @@ services:
flat-network-providers: physnet1
neutron-security-groups: true
openstack-origin: *source
channel: candidate
neutron-openvswitch:
charm: cs:~openstack-charmers-next/neutron-openvswitch
charm: cs:~openstack-charmers/neutron-openvswitch
channel: candidate
neutron-gateway:
charm: cs:~openstack-charmers-next/neutron-gateway
charm: cs:~openstack-charmers/neutron-gateway
num_units: 1
options:
bridge-mappings: physnet1:br-ex
openstack-origin: *source
channel: candidate
rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server
charm: cs:~openstack-charmers/rabbitmq-server
num_units: 1
options:
source: *source
channel: candidate
percona-cluster:
charm: cs:~openstack-charmers-next/percona-cluster
charm: cs:~openstack-charmers/percona-cluster
num_units: 1
options:
source: *source
channel: candidate
keystone:
charm: cs:~openstack-charmers-next/keystone
charm: cs:~openstack-charmers/keystone
num_units: 1
options:
openstack-origin: *source
channel: candidate
relations:
- - ceph-mon

63
src/tests/bundles/focal-ussuri.yaml
View File

@@ -38,22 +38,29 @@ machines:
services:
manila-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
charm: cs:~openstack-charmers/mysql-router
channel: candidate
manila-ganesha-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
charm: cs:~openstack-charmers/mysql-router
channel: candidate
keystone-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
charm: cs:~openstack-charmers/mysql-router
channel: candidate
neutron-api-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
charm: cs:~openstack-charmers/mysql-router
channel: candidate
nova-cloud-controller-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
charm: cs:~openstack-charmers/mysql-router
channel: candidate
glance-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
charm: cs:~openstack-charmers/mysql-router
channel: candidate
placement-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
charm: cs:~openstack-charmers/mysql-router
channel: candidate
mysql-innodb-cluster:
charm: cs:~openstack-charmers-next/mysql-innodb-cluster
charm: cs:~openstack-charmers/mysql-innodb-cluster
num_units: 3
options:
source: *openstack-origin
@@ -61,6 +68,7 @@ services:
- '0'
- '1'
- '2'
channel: candidate
manila-ganesha-az1:
num_units: 3
@@ -73,16 +81,17 @@ services:
- '5'
ceph-mon:
charm: cs:~openstack-charmers-next/ceph-mon
charm: cs:~openstack-charmers/ceph-mon
num_units: 3
options:
source: *openstack-origin
to:
- '6'
- '7'
channel: candidate
ceph-osd:
charm: cs:~openstack-charmers-next/ceph-osd
charm: cs:~openstack-charmers/ceph-osd
num_units: 3
options:
source: *openstack-origin
@@ -92,18 +101,20 @@ services:
- '8'
- '9'
- '10'
channel: candidate
ceph-fs:
charm: cs:~openstack-charmers-next/ceph-fs
charm: cs:~openstack-charmers/ceph-fs
num_units: 2
options:
source: *openstack-origin
to:
- '11'
- '12'
channel: candidate
manila:
charm: cs:~openstack-charmers-next/manila
charm: cs:~openstack-charmers/manila
num_units: 1
options:
default-share-backend: cephfsnfs1
@@ -111,26 +122,29 @@ services:
openstack-origin: *openstack-origin
to:
- '13'
channel: candidate
nova-cloud-controller:
charm: cs:~openstack-charmers-next/nova-cloud-controller
charm: cs:~openstack-charmers/nova-cloud-controller
num_units: 1
options:
network-manager: Neutron
openstack-origin: *openstack-origin
to:
- '14'
channel: candidate
placement:
charm: cs:~openstack-charmers-next/placement
charm: cs:~openstack-charmers/placement
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '15'
channel: candidate
nova-compute:
charm: cs:~openstack-charmers-next/nova-compute
charm: cs:~openstack-charmers/nova-compute
num_units: 2
options:
config-flags: default_ephemeral_format=ext4
@@ -141,17 +155,19 @@ services:
to:
- '16'
- '17'
channel: candidate
glance:
charm: cs:~openstack-charmers-next/glance
charm: cs:~openstack-charmers/glance
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '18'
channel: candidate
neutron-api:
charm: cs:~openstack-charmers-next/neutron-api
charm: cs:~openstack-charmers/neutron-api
num_units: 1
options:
manage-neutron-plugin-legacy-mode: true
@@ -161,34 +177,39 @@ services:
openstack-origin: *openstack-origin
to:
- '19'
channel: candidate
neutron-openvswitch:
charm: cs:~openstack-charmers-next/neutron-openvswitch
charm: cs:~openstack-charmers/neutron-openvswitch
channel: candidate
neutron-gateway:
charm: cs:~openstack-charmers-next/neutron-gateway
charm: cs:~openstack-charmers/neutron-gateway
num_units: 1
options:
bridge-mappings: physnet1:br-ex
openstack-origin: *openstack-origin
to:
- '20'
channel: candidate
rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server
charm: cs:~openstack-charmers/rabbitmq-server
num_units: 1
options:
source: *openstack-origin
to:
- '21'
channel: candidate
keystone:
charm: cs:~openstack-charmers-next/keystone
charm: cs:~openstack-charmers/keystone
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '22'
channel: candidate
relations:

63
src/tests/bundles/focal-victoria.yaml
View File

@@ -38,22 +38,29 @@ machines:
services:
manila-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
charm: cs:~openstack-charmers/mysql-router
channel: candidate
manila-ganesha-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
charm: cs:~openstack-charmers/mysql-router
channel: candidate
keystone-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
charm: cs:~openstack-charmers/mysql-router
channel: candidate
neutron-api-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
charm: cs:~openstack-charmers/mysql-router
channel: candidate
nova-cloud-controller-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
charm: cs:~openstack-charmers/mysql-router
channel: candidate
glance-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
charm: cs:~openstack-charmers/mysql-router
channel: candidate
placement-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
charm: cs:~openstack-charmers/mysql-router
channel: candidate
mysql-innodb-cluster:
charm: cs:~openstack-charmers-next/mysql-innodb-cluster
charm: cs:~openstack-charmers/mysql-innodb-cluster
num_units: 3
options:
source: *openstack-origin
@@ -61,6 +68,7 @@ services:
- '0'
- '1'
- '2'
channel: candidate
manila-ganesha-az1:
num_units: 3
@@ -73,16 +81,17 @@ services:
- '5'
ceph-mon:
charm: cs:~openstack-charmers-next/ceph-mon
charm: cs:~openstack-charmers/ceph-mon
num_units: 3
options:
source: *openstack-origin
to:
- '6'
- '7'
channel: candidate
ceph-osd:
charm: cs:~openstack-charmers-next/ceph-osd
charm: cs:~openstack-charmers/ceph-osd
num_units: 3
options:
source: *openstack-origin
@@ -92,18 +101,20 @@ services:
- '8'
- '9'
- '10'
channel: candidate
ceph-fs:
charm: cs:~openstack-charmers-next/ceph-fs
charm: cs:~openstack-charmers/ceph-fs
num_units: 2
options:
source: *openstack-origin
to:
- '11'
- '12'
channel: candidate
manila:
charm: cs:~openstack-charmers-next/manila
charm: cs:~openstack-charmers/manila
num_units: 1
options:
default-share-backend: cephfsnfs1
@@ -111,26 +122,29 @@ services:
openstack-origin: *openstack-origin
to:
- '13'
channel: candidate
nova-cloud-controller:
charm: cs:~openstack-charmers-next/nova-cloud-controller
charm: cs:~openstack-charmers/nova-cloud-controller
num_units: 1
options:
network-manager: Neutron
openstack-origin: *openstack-origin
to:
- '14'
channel: candidate
placement:
charm: cs:~openstack-charmers-next/placement
charm: cs:~openstack-charmers/placement
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '15'
channel: candidate
nova-compute:
charm: cs:~openstack-charmers-next/nova-compute
charm: cs:~openstack-charmers/nova-compute
num_units: 2
options:
config-flags: default_ephemeral_format=ext4
@@ -141,17 +155,19 @@ services:
to:
- '16'
- '17'
channel: candidate
glance:
charm: cs:~openstack-charmers-next/glance
charm: cs:~openstack-charmers/glance
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '18'
channel: candidate
neutron-api:
charm: cs:~openstack-charmers-next/neutron-api
charm: cs:~openstack-charmers/neutron-api
num_units: 1
options:
manage-neutron-plugin-legacy-mode: true
@@ -161,34 +177,39 @@ services:
openstack-origin: *openstack-origin
to:
- '19'
channel: candidate
neutron-openvswitch:
charm: cs:~openstack-charmers-next/neutron-openvswitch
charm: cs:~openstack-charmers/neutron-openvswitch
channel: candidate
neutron-gateway:
charm: cs:~openstack-charmers-next/neutron-gateway
charm: cs:~openstack-charmers/neutron-gateway
num_units: 1
options:
bridge-mappings: physnet1:br-ex
openstack-origin: *openstack-origin
to:
- '20'
channel: candidate
rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server
charm: cs:~openstack-charmers/rabbitmq-server
num_units: 1
options:
source: *openstack-origin
to:
- '21'
channel: candidate
keystone:
charm: cs:~openstack-charmers-next/keystone
charm: cs:~openstack-charmers/keystone
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '22'
channel: candidate
relations:

63
src/tests/bundles/focal-wallaby.yaml
View File

@@ -38,22 +38,29 @@ machines:
services:
manila-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
charm: cs:~openstack-charmers/mysql-router
channel: candidate
manila-ganesha-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
charm: cs:~openstack-charmers/mysql-router
channel: candidate
keystone-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
charm: cs:~openstack-charmers/mysql-router
channel: candidate
neutron-api-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
charm: cs:~openstack-charmers/mysql-router
channel: candidate
nova-cloud-controller-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
charm: cs:~openstack-charmers/mysql-router
channel: candidate
glance-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
charm: cs:~openstack-charmers/mysql-router
channel: candidate
placement-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
charm: cs:~openstack-charmers/mysql-router
channel: candidate
mysql-innodb-cluster:
charm: cs:~openstack-charmers-next/mysql-innodb-cluster
charm: cs:~openstack-charmers/mysql-innodb-cluster
num_units: 3
options:
source: *openstack-origin
@@ -61,6 +68,7 @@ services:
- '0'
- '1'
- '2'
channel: candidate
manila-ganesha-az1:
num_units: 3
@@ -73,16 +81,17 @@ services:
- '5'
ceph-mon:
charm: cs:~openstack-charmers-next/ceph-mon
charm: cs:~openstack-charmers/ceph-mon
num_units: 3
options:
source: *openstack-origin
to:
- '6'
- '7'
channel: candidate
ceph-osd:
charm: cs:~openstack-charmers-next/ceph-osd
charm: cs:~openstack-charmers/ceph-osd
num_units: 3
options:
source: *openstack-origin
@@ -92,18 +101,20 @@ services:
- '8'
- '9'
- '10'
channel: candidate
ceph-fs:
charm: cs:~openstack-charmers-next/ceph-fs
charm: cs:~openstack-charmers/ceph-fs
num_units: 2
options:
source: *openstack-origin
to:
- '11'
- '12'
channel: candidate
manila:
charm: cs:~openstack-charmers-next/manila
charm: cs:~openstack-charmers/manila
num_units: 1
options:
default-share-backend: cephfsnfs1
@@ -111,26 +122,29 @@ services:
openstack-origin: *openstack-origin
to:
- '13'
channel: candidate
nova-cloud-controller:
charm: cs:~openstack-charmers-next/nova-cloud-controller
charm: cs:~openstack-charmers/nova-cloud-controller
num_units: 1
options:
network-manager: Neutron
openstack-origin: *openstack-origin
to:
- '14'
channel: candidate
placement:
charm: cs:~openstack-charmers-next/placement
charm: cs:~openstack-charmers/placement
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '15'
channel: candidate
nova-compute:
charm: cs:~openstack-charmers-next/nova-compute
charm: cs:~openstack-charmers/nova-compute
num_units: 2
options:
config-flags: default_ephemeral_format=ext4
@@ -141,17 +155,19 @@ services:
to:
- '16'
- '17'
channel: candidate
glance:
charm: cs:~openstack-charmers-next/glance
charm: cs:~openstack-charmers/glance
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '18'
channel: candidate
neutron-api:
charm: cs:~openstack-charmers-next/neutron-api
charm: cs:~openstack-charmers/neutron-api
num_units: 1
options:
manage-neutron-plugin-legacy-mode: true
@@ -161,34 +177,39 @@ services:
openstack-origin: *openstack-origin
to:
- '19'
channel: candidate
neutron-openvswitch:
charm: cs:~openstack-charmers-next/neutron-openvswitch
charm: cs:~openstack-charmers/neutron-openvswitch
channel: candidate
neutron-gateway:
charm: cs:~openstack-charmers-next/neutron-gateway
charm: cs:~openstack-charmers/neutron-gateway
num_units: 1
options:
bridge-mappings: physnet1:br-ex
openstack-origin: *openstack-origin
to:
- '20'
channel: candidate
rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server
charm: cs:~openstack-charmers/rabbitmq-server
num_units: 1
options:
source: *openstack-origin
to:
- '21'
channel: candidate
keystone:
charm: cs:~openstack-charmers-next/keystone
charm: cs:~openstack-charmers/keystone
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '22'
channel: candidate
relations:

63
src/tests/bundles/groovy-victoria.yaml
View File

@@ -39,22 +39,29 @@ machines:
services:
manila-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
charm: cs:~openstack-charmers/mysql-router
channel: candidate
manila-ganesha-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
charm: cs:~openstack-charmers/mysql-router
channel: candidate
keystone-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
charm: cs:~openstack-charmers/mysql-router
channel: candidate
neutron-api-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
charm: cs:~openstack-charmers/mysql-router
channel: candidate
nova-cloud-controller-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
charm: cs:~openstack-charmers/mysql-router
channel: candidate
glance-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
charm: cs:~openstack-charmers/mysql-router
channel: candidate
placement-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
charm: cs:~openstack-charmers/mysql-router
channel: candidate
mysql-innodb-cluster:
charm: cs:~openstack-charmers-next/mysql-innodb-cluster
charm: cs:~openstack-charmers/mysql-innodb-cluster
num_units: 3
options:
source: *openstack-origin
@@ -62,6 +69,7 @@ services:
- '0'
- '1'
- '2'
channel: candidate
manila-ganesha-az1:
num_units: 3
@@ -74,7 +82,7 @@ services:
- '5'
ceph-mon:
charm: cs:~openstack-charmers-next/ceph-mon
charm: cs:~openstack-charmers/ceph-mon
num_units: 3
options:
source: *openstack-origin
@@ -82,9 +90,10 @@ services:
- '6'
- '7'
- '8'
channel: candidate
ceph-osd:
charm: cs:~openstack-charmers-next/ceph-osd
charm: cs:~openstack-charmers/ceph-osd
num_units: 3
options:
source: *openstack-origin
@@ -94,18 +103,20 @@ services:
- '9'
- '10'
- '11'
channel: candidate
ceph-fs:
charm: cs:~openstack-charmers-next/ceph-fs
charm: cs:~openstack-charmers/ceph-fs
num_units: 2
options:
source: *openstack-origin
to:
- '12'
- '13'
channel: candidate
manila:
charm: cs:~openstack-charmers-next/manila
charm: cs:~openstack-charmers/manila
num_units: 1
options:
default-share-backend: cephfsnfs1
@@ -113,26 +124,29 @@ services:
openstack-origin: *openstack-origin
to:
- '14'
channel: candidate
nova-cloud-controller:
charm: cs:~openstack-charmers-next/nova-cloud-controller
charm: cs:~openstack-charmers/nova-cloud-controller
num_units: 1
options:
network-manager: Neutron
openstack-origin: *openstack-origin
to:
- '15'
channel: candidate
placement:
charm: cs:~openstack-charmers-next/placement
charm: cs:~openstack-charmers/placement
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '16'
channel: candidate
nova-compute:
charm: cs:~openstack-charmers-next/nova-compute
charm: cs:~openstack-charmers/nova-compute
num_units: 2
options:
config-flags: default_ephemeral_format=ext4
@@ -143,17 +157,19 @@ services:
to:
- '17'
- '18'
channel: candidate
glance:
charm: cs:~openstack-charmers-next/glance
charm: cs:~openstack-charmers/glance
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '19'
channel: candidate
neutron-api:
charm: cs:~openstack-charmers-next/neutron-api
charm: cs:~openstack-charmers/neutron-api
num_units: 1
options:
manage-neutron-plugin-legacy-mode: true
@@ -163,34 +179,39 @@ services:
openstack-origin: *openstack-origin
to:
- '20'
channel: candidate
neutron-openvswitch:
charm: cs:~openstack-charmers-next/neutron-openvswitch
charm: cs:~openstack-charmers/neutron-openvswitch
channel: candidate
neutron-gateway:
charm: cs:~openstack-charmers-next/neutron-gateway
charm: cs:~openstack-charmers/neutron-gateway
num_units: 1
options:
bridge-mappings: physnet1:br-ex
openstack-origin: *openstack-origin
to:
- '21'
channel: candidate
rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server
charm: cs:~openstack-charmers/rabbitmq-server
num_units: 1
options:
source: *openstack-origin
to:
- '22'
channel: candidate
keystone:
charm: cs:~openstack-charmers-next/keystone
charm: cs:~openstack-charmers/keystone
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '23'
channel: candidate
relations:

63
src/tests/bundles/hirsute-wallaby.yaml
View File

@@ -39,22 +39,29 @@ machines:
services:
manila-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
charm: cs:~openstack-charmers/mysql-router
channel: candidate
manila-ganesha-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
charm: cs:~openstack-charmers/mysql-router
channel: candidate
keystone-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
charm: cs:~openstack-charmers/mysql-router
channel: candidate
neutron-api-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
charm: cs:~openstack-charmers/mysql-router
channel: candidate
nova-cloud-controller-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
charm: cs:~openstack-charmers/mysql-router
channel: candidate
glance-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
charm: cs:~openstack-charmers/mysql-router
channel: candidate
placement-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
charm: cs:~openstack-charmers/mysql-router
channel: candidate
mysql-innodb-cluster:
charm: cs:~openstack-charmers-next/mysql-innodb-cluster
charm: cs:~openstack-charmers/mysql-innodb-cluster
num_units: 3
options:
source: *openstack-origin
@@ -62,6 +69,7 @@ services:
- '0'
- '1'
- '2'
channel: candidate
manila-ganesha-az1:
num_units: 3
@@ -74,7 +82,7 @@ services:
- '5'
ceph-mon:
charm: cs:~openstack-charmers-next/ceph-mon
charm: cs:~openstack-charmers/ceph-mon
num_units: 3
options:
source: *openstack-origin
@@ -82,9 +90,10 @@ services:
- '6'
- '7'
- '8'
channel: candidate
ceph-osd:
charm: cs:~openstack-charmers-next/ceph-osd
charm: cs:~openstack-charmers/ceph-osd
num_units: 3
options:
source: *openstack-origin
@@ -94,18 +103,20 @@ services:
- '9'
- '10'
- '11'
channel: candidate
ceph-fs:
charm: cs:~openstack-charmers-next/ceph-fs
charm: cs:~openstack-charmers/ceph-fs
num_units: 2
options:
source: *openstack-origin
to:
- '12'
- '13'
channel: candidate
manila:
charm: cs:~openstack-charmers-next/manila
charm: cs:~openstack-charmers/manila
num_units: 1
options:
default-share-backend: cephfsnfs1
@@ -113,26 +124,29 @@ services:
openstack-origin: *openstack-origin
to:
- '14'
channel: candidate
nova-cloud-controller:
charm: cs:~openstack-charmers-next/nova-cloud-controller
charm: cs:~openstack-charmers/nova-cloud-controller
num_units: 1
options:
network-manager: Neutron
openstack-origin: *openstack-origin
to:
- '15'
channel: candidate
placement:
charm: cs:~openstack-charmers-next/placement
charm: cs:~openstack-charmers/placement
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '16'
channel: candidate
nova-compute:
charm: cs:~openstack-charmers-next/nova-compute
charm: cs:~openstack-charmers/nova-compute
num_units: 2
options:
config-flags: default_ephemeral_format=ext4
@@ -143,17 +157,19 @@ services:
to:
- '17'
- '18'
channel: candidate
glance:
charm: cs:~openstack-charmers-next/glance
charm: cs:~openstack-charmers/glance
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '19'
channel: candidate
neutron-api:
charm: cs:~openstack-charmers-next/neutron-api
charm: cs:~openstack-charmers/neutron-api
num_units: 1
options:
manage-neutron-plugin-legacy-mode: true
@@ -163,34 +179,39 @@ services:
openstack-origin: *openstack-origin
to:
- '20'
channel: candidate
neutron-openvswitch:
charm: cs:~openstack-charmers-next/neutron-openvswitch
charm: cs:~openstack-charmers/neutron-openvswitch
channel: candidate
neutron-gateway:
charm: cs:~openstack-charmers-next/neutron-gateway
charm: cs:~openstack-charmers/neutron-gateway
num_units: 1
options:
bridge-mappings: physnet1:br-ex
openstack-origin: *openstack-origin
to:
- '21'
channel: candidate
rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server
charm: cs:~openstack-charmers/rabbitmq-server
num_units: 1
options:
source: *openstack-origin
to:
- '22'
channel: candidate
keystone:
charm: cs:~openstack-charmers-next/keystone
charm: cs:~openstack-charmers/keystone
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '23'
channel: candidate
relations:

3
src/tests/bundles/overlays/local-charm-overlay.yaml.j2
View File

@@ -5,8 +5,9 @@ applications:
vip: '{{ OS_VIP00 }}'
debug: True
hacluster:
charm: cs:~openstack-charmers-next/hacluster
charm: cs:~openstack-charmers/hacluster
num_units: 0
channel: candidate
manila:
options:
debug: True

4
src/tox.ini
View File

@@ -22,12 +22,12 @@ skip_missing_interpreters = False
requires = pip < 20.3
virtualenv < 20.0
# NOTE: https://wiki.canonical.com/engineering/OpenStack/InstallLatestToxOnOsci
minversion = 3.2.0
minversion = 3.18.0
[testenv]
setenv = VIRTUAL_ENV={envdir}
PYTHONHASHSEED=0
whitelist_externals = juju
allowlist_externals = juju
passenv = HOME TERM CS_* OS_* TEST_*
deps = -r{toxinidir}/test-requirements.txt
install_command =

4
src/wheelhouse.txt
View File

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

15
test-requirements.txt
View File

@@ -3,9 +3,8 @@
# choices of *requirements.txt files for OpenStack Charms:
# https://github.com/openstack-charmers/release-tools
#
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
# Lint and unit test requirements
flake8>=2.2.4
stestr>=2.2.0
@@ -35,13 +34,19 @@ mock>=1.2; python_version >= '3.6'
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/21.10#egg=charms.openstack
#
# Revisit for removal / mock improvement:
#
# NOTE(lourot): newer versions of cryptography require a Rust compiler to build,
# see
# * https://github.com/openstack-charmers/zaza/issues/421
# * https://mail.python.org/pipermail/cryptography-dev/2021-January/001003.html
#
netifaces # vault
psycopg2-binary # vault
tenacity # vault
pbr # vault
cryptography # vault, keystone-saml-mellon
pbr==5.6.0 # vault
cryptography<3.4 # vault, keystone-saml-mellon
lxml # keystone-saml-mellon
hvac # vault, barbican-vault

20
tox.ini
View File

@@ -11,6 +11,21 @@ envlist = pep8,py3
sitepackages = False
# NOTE: Avoid false positives by not skipping missing interpreters.
skip_missing_interpreters = False
# NOTES:
# * We avoid the new dependency resolver by pinning pip < 20.3, see
# https://github.com/pypa/pip/issues/9187
# * Pinning dependencies requires tox >= 3.2.0, see
# https://tox.readthedocs.io/en/latest/config.html#conf-requires
# * It is also necessary to pin virtualenv as a newer virtualenv would still
# lead to fetching the latest pip in the func* tox targets, see
# https://stackoverflow.com/a/38133283
requires =
pip < 20.3
virtualenv < 20.0
setuptools<50.0.0
# NOTE: https://wiki.canonical.com/engineering/OpenStack/InstallLatestToxOnOsci
minversion = 3.18.0
[testenv]
setenv = VIRTUAL_ENV={envdir}
@@ -21,7 +36,7 @@ setenv = VIRTUAL_ENV={envdir}
JUJU_REPOSITORY={toxinidir}/build
passenv = http_proxy https_proxy INTERFACE_PATH LAYER_PATH JUJU_REPOSITORY
install_command =
pip install {opts} {packages}
{toxinidir}/pip.sh install {opts} {packages}
deps =
-r{toxinidir}/requirements.txt
@@ -62,7 +77,8 @@ commands = stestr run --slowest {posargs}
[testenv:pep8]
basepython = python3
deps = -r{toxinidir}/test-requirements.txt
deps = flake8==3.9.2
charm-tools==2.8.3
commands = flake8 {posargs} src unit_tests
[testenv:cover]