Use tls-certificates-interface library

Use tls-certificates-interface library from
https://charmhub.io/tls-certificates-interface/libraries/tls_certificates

Fix pep8 issues by pining flake8<6
Fix py3 failures due to cryptography package
clashes from zaza. Move zaza dependcies from
test-requirements to tox

Depends-On: https://review.opendev.org/c/openstack/charm-ops-sunbeam/+/865410
Change-Id: If104bdfb2df7f7e10044ed4d47e4211794e9d3fb
This commit is contained in:
Hemanth Nakkina 2022-11-28 16:24:17 +05:30
parent 67973afcb3
commit 132c8fa231
7 changed files with 1283 additions and 17 deletions

View File

@ -5,5 +5,6 @@ charmcraft fetch-lib charms.data_platform_libs.v0.database_requires
charmcraft fetch-lib charms.keystone_k8s.v0.identity_service charmcraft fetch-lib charms.keystone_k8s.v0.identity_service
charmcraft fetch-lib charms.rabbitmq_k8s.v0.rabbitmq charmcraft fetch-lib charms.rabbitmq_k8s.v0.rabbitmq
charmcraft fetch-lib charms.observability_libs.v0.kubernetes_service_patch charmcraft fetch-lib charms.observability_libs.v0.kubernetes_service_patch
charmcraft fetch-lib charms.tls_certificates_interface.v1.tls_certificates
charmcraft fetch-lib charms.traefik_k8s.v1.ingress charmcraft fetch-lib charms.traefik_k8s.v1.ingress
charmcraft fetch-lib charms.ovn_central_k8s.v0.ovsdb charmcraft fetch-lib charms.ovn_central_k8s.v0.ovsdb

File diff suppressed because it is too large Load Diff

View File

@ -12,4 +12,3 @@ lightkube-models
ops ops
git+https://opendev.org/openstack/charm-ops-sunbeam#egg=ops_sunbeam git+https://opendev.org/openstack/charm-ops-sunbeam#egg=ops_sunbeam
git+https://opendev.org/openstack/charm-ops-interface-tls-certificates#egg=interface_tls_certificates

View File

@ -8,7 +8,4 @@ coverage
mock mock
flake8 flake8
stestr stestr
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://opendev.org/openstack/tempest.git#egg=tempest
ops ops

View File

@ -62,12 +62,13 @@ applications:
channel: 22.03/edge channel: 22.03/edge
scale: 1 scale: 1
trust: true trust: true
vault: tls-operator:
charm: ch:icey-vault-k8s charm: tls-certificates-operator
channel: stable channel: edge
scale: 1 scale: 1
resources: options:
vault-image: vault generate-self-signed-certificates: true
ca-common-name: internal-ca
relations: relations:
- - mysql:database - - mysql:database
@ -122,10 +123,10 @@ relations:
- neutron:ingress-internal - neutron:ingress-internal
- - traefik-public:ingress - - traefik-public:ingress
- neutron:ingress-public - neutron:ingress-public
- - vault:insecure-certificates - - tls-operator:certificates
- neutron:certificates - neutron:certificates
- - neutron:ovsdb-cms - - neutron:ovsdb-cms
- ovn-central:ovsdb-cms - ovn-central:ovsdb-cms
- - vault:insecure-certificates - - tls-operator:certificates
- ovn-central:certificates - ovn-central:certificates

View File

@ -58,10 +58,10 @@ target_deploy_status:
workload-status-message-regex: '^$' workload-status-message-regex: '^$'
mysql: mysql:
workload-status: active workload-status: active
workload-status-message-regex: '^$' workload-status-message-regex: '^Unit is ready.*$'
placement: placement:
workload-status: active workload-status: active
workload-status-message-regex: '^$' workload-status-message-regex: '^$'
vault: tls-operator:
workload-status: active workload-status: active
workload-status-message-regex: '^$' workload-status-message-regex: '^$'

View File

@ -30,8 +30,8 @@ commands = stestr run --slowest {posargs}
allowlist_externals = allowlist_externals =
git git
charmcraft charmcraft
fetch-libs.sh {toxinidir}/fetch-libs.sh
rename.sh {toxinidir}/rename.sh
deps = deps =
-r{toxinidir}/test-requirements.txt -r{toxinidir}/test-requirements.txt
@ -98,8 +98,7 @@ commands = {[testenv:lint]commands}
description = Check code against coding style standards description = Check code against coding style standards
deps = deps =
black black
# flake8==4.0.1 # Pin version until https://github.com/csachs/pyproject-flake8/pull/14 is merged flake8<6 # Pin version until https://github.com/savoirfairelinux/flake8-copyright/issues/19 is merged
flake8
flake8-docstrings flake8-docstrings
flake8-copyright flake8-copyright
flake8-builtins flake8-builtins
@ -116,16 +115,22 @@ commands =
[testenv:func-noop] [testenv:func-noop]
basepython = python3 basepython = python3
deps =
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://opendev.org/openstack/tempest.git#egg=tempest
commands = commands =
functest-run-suite --help functest-run-suite --help
[testenv:func] [testenv:func]
basepython = python3 basepython = python3
deps = {[testenv:func-noop]deps}
commands = commands =
functest-run-suite --keep-model functest-run-suite --keep-model
[testenv:func-smoke] [testenv:func-smoke]
basepython = python3 basepython = python3
deps = {[testenv:func-noop]deps}
setenv = setenv =
TEST_MODEL_SETTINGS = automatically-retry-hooks=true TEST_MODEL_SETTINGS = automatically-retry-hooks=true
TEST_MAX_RESOLVE_COUNT = 5 TEST_MAX_RESOLVE_COUNT = 5
@ -134,11 +139,13 @@ commands =
[testenv:func-dev] [testenv:func-dev]
basepython = python3 basepython = python3
deps = {[testenv:func-noop]deps}
commands = commands =
functest-run-suite --keep-model --dev functest-run-suite --keep-model --dev
[testenv:func-target] [testenv:func-target]
basepython = python3 basepython = python3
deps = {[testenv:func-noop]deps}
commands = commands =
functest-run-suite --keep-model --bundle {posargs} functest-run-suite --keep-model --bundle {posargs}