Use tls-certificates-interface library

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

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: I0f211b43bd9a8fec14cccd3699181e7f9bd34542
This commit is contained in:
Hemanth Nakkina 2022-11-28 16:16:07 +05:30
parent c442199eaa
commit ea5025cbd9
8 changed files with 1289 additions and 16 deletions

View File

@ -2,6 +2,13 @@
templates:
- openstack-python3-charm-yoga-jobs
- openstack-cover-jobs
- microk8s-func-test
# - microk8s-func-test
check:
jobs:
- charmbuild:
nodeset: ubuntu-focal
- zaza-smoke-test:
nodeset: ubuntu-focal
voting: false
vars:
charm_build_name: ovn-relay-k8s

View File

@ -3,3 +3,4 @@
echo "INFO: Fetching libs from charmhub."
charmcraft fetch-lib charms.observability_libs.v0.kubernetes_service_patch
charmcraft fetch-lib charms.ovn_central_k8s.v0.ovsdb
charmcraft fetch-lib charms.tls_certificates_interface.v1.tls_certificates

File diff suppressed because it is too large Load Diff

View File

@ -6,9 +6,8 @@
cryptography
jinja2
jsonschema
lightkube
lightkube-models
ops
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

@ -6,9 +6,5 @@
coverage
mock
flake8
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

View File

@ -66,12 +66,13 @@ applications:
trust: true
resources:
ovn-sb-db-server-image: kolla/ubuntu-binary-ovn-sb-db-server:yoga
vault:
charm: ch:icey-vault-k8s
channel: stable
tls-operator:
charm: tls-certificates-operator
channel: edge
scale: 1
resources:
vault-image: vault
options:
generate-self-signed-certificates: true
ca-common-name: internal-ca
relations:
- - mysql:database
@ -126,15 +127,15 @@ relations:
- neutron:ingress-internal
- - traefik-public:ingress
- neutron:ingress-public
- - vault:insecure-certificates
- - tls-operator:certificates
- neutron:certificates
- - neutron:ovsdb-cms
- ovn-central:ovsdb-cms
- - vault:insecure-certificates
- - tls-operator:certificates
- ovn-central:certificates
- - vault:insecure-certificates
- - tls-operator:certificates
- ovn-relay:certificates
- - ovn-relay:ovsdb-cms
- ovn-central:ovsdb-cms

View File

@ -65,7 +65,7 @@ target_deploy_status:
placement:
workload-status: active
workload-status-message-regex: '^$'
vault:
tls-operator:
workload-status: active
workload-status-message-regex: '^$'
ovn-relay:

View File

@ -115,16 +115,22 @@ commands =
[testenv:func-noop]
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 =
functest-run-suite --help
[testenv:func]
basepython = python3
deps = {[testenv:func-noop]deps}
commands =
functest-run-suite --keep-model
[testenv:func-smoke]
basepython = python3
deps = {[testenv:func-noop]deps}
setenv =
TEST_MODEL_SETTINGS = automatically-retry-hooks=true
TEST_MAX_RESOLVE_COUNT = 5
@ -133,11 +139,13 @@ commands =
[testenv:func-dev]
basepython = python3
deps = {[testenv:func-noop]deps}
commands =
functest-run-suite --keep-model --dev
[testenv:func-target]
basepython = python3
deps = {[testenv:func-noop]deps}
commands =
functest-run-suite --keep-model --bundle {posargs}