From dfede5f34fa0c43618a45f286697cfe71b922028 Mon Sep 17 00:00:00 2001 From: Ryan Beisner Date: Wed, 14 Nov 2018 13:19:59 +0100 Subject: [PATCH] Update tests, tox, series and readme for 18.11 release --- src/README.md | 8 +++++- src/metadata.yaml | 5 ++-- src/tests/bundles/cosmic-rocky.yaml | 39 +++++++++++++++++++++++++++++ src/tests/tests.yaml | 3 +++ src/tox.ini | 2 +- tox.ini | 14 +++++++++-- 6 files changed, 65 insertions(+), 6 deletions(-) create mode 100644 src/tests/bundles/cosmic-rocky.yaml diff --git a/src/README.md b/src/README.md index 25ed2b1..009b6fe 100644 --- a/src/README.md +++ b/src/README.md @@ -1,6 +1,12 @@ # Overview -This charm provides secrets storage in Vault to Barbican +The Barbican-Vault charm provies a Vault backend for OpenStack Barbican + +OpenStack Rocky or later is required. + +This charm, when used with the Barbican Charm, provides a software-based +secrets-as-a-service solution for an OpenStack Cloud. In the future, other +back-ends may be added. # Usage diff --git a/src/metadata.yaml b/src/metadata.yaml index 7e28722..1dd0275 100644 --- a/src/metadata.yaml +++ b/src/metadata.yaml @@ -1,11 +1,12 @@ name: barbican-vault -summary: OpenStack Barbican vault backend +summary: Vault backend for OpenStack Barbican maintainer: OpenStack Charmers -description: OpenStack Barbican vault backend +description: Vault backend for OpenStack Barbican tags: - openstack series: - bionic + - cosmic subordinate: true provides: secrets: diff --git a/src/tests/bundles/cosmic-rocky.yaml b/src/tests/bundles/cosmic-rocky.yaml new file mode 100644 index 0000000..41c38a4 --- /dev/null +++ b/src/tests/bundles/cosmic-rocky.yaml @@ -0,0 +1,39 @@ +series: cosmic +relations: +- - mysql:shared-db + - keystone:shared-db +- - mysql:shared-db + - vault:shared-db +- - mysql:shared-db + - barbican:shared-db +- - keystone:identity-service + - barbican:identity-service +- - rabbitmq-server:amqp + - barbican:amqp +- - barbican-vault:secrets + - barbican:secrets +- - vault:secrets + - barbican-vault:secrets-storage +applications: + mysql: + charm: cs:~openstack-charmers-next/percona-cluster + num_units: 1 + keystone: + charm: cs:~openstack-charmers-next/keystone + num_units: 1 + options: + barbican: + series: bionic + charm: cs:~openstack-charmers-next/barbican + num_units: 1 + options: + barbican-vault: + series: bionic + charm: ../../../barbican-vault + num_units: 0 + rabbitmq-server: + charm: cs:~openstack-charmers-next/rabbitmq-server + num_units: 1 + vault: + charm: cs:~openstack-charmers-next/vault + num_units: 1 diff --git a/src/tests/tests.yaml b/src/tests/tests.yaml index acd9e1c..f1a74b0 100644 --- a/src/tests/tests.yaml +++ b/src/tests/tests.yaml @@ -1,6 +1,9 @@ charm_name: barbican-vault smoke_bundles: - bionic-rocky +gate_bundles: +- bionic-rocky +- cosmic-rocky target_deploy_status: barbican-vault: workload-status: waiting diff --git a/src/tox.ini b/src/tox.ini index ba390f0..2ccfd25 100644 --- a/src/tox.ini +++ b/src/tox.ini @@ -12,7 +12,7 @@ install_command = pip install {opts} {packages} [testenv:pep8] -basepython = python2.7 +basepython = python3 deps=charm-tools commands = charm-proof diff --git a/tox.ini b/tox.ini index 3993800..266fb54 100644 --- a/tox.ini +++ b/tox.ini @@ -10,9 +10,8 @@ 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 +passenv = http_proxy https_proxy INTERFACE_PATH install_command = pip install {opts} {packages} deps = @@ -28,12 +27,23 @@ basepython = python3 deps = -r{toxinidir}/test-requirements.txt commands = ostestr {posargs} +[testenv:py35] +basepython = python3.5 +deps = -r{toxinidir}/test-requirements.txt +commands = ostestr {posargs} + +[testenv:py36] +basepython = python3.6 +deps = -r{toxinidir}/test-requirements.txt +commands = ostestr {posargs} + [testenv:pep8] basepython = python3 deps = -r{toxinidir}/test-requirements.txt commands = flake8 {posargs} src unit_tests [testenv:venv] +basepython = python3 commands = {posargs} [flake8]