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:
parent
c442199eaa
commit
ea5025cbd9
@ -2,6 +2,13 @@
|
|||||||
templates:
|
templates:
|
||||||
- openstack-python3-charm-yoga-jobs
|
- openstack-python3-charm-yoga-jobs
|
||||||
- openstack-cover-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:
|
vars:
|
||||||
charm_build_name: ovn-relay-k8s
|
charm_build_name: ovn-relay-k8s
|
||||||
|
@ -3,3 +3,4 @@
|
|||||||
echo "INFO: Fetching libs from charmhub."
|
echo "INFO: Fetching libs from charmhub."
|
||||||
charmcraft fetch-lib charms.observability_libs.v0.kubernetes_service_patch
|
charmcraft fetch-lib charms.observability_libs.v0.kubernetes_service_patch
|
||||||
charmcraft fetch-lib charms.ovn_central_k8s.v0.ovsdb
|
charmcraft fetch-lib charms.ovn_central_k8s.v0.ovsdb
|
||||||
|
charmcraft fetch-lib charms.tls_certificates_interface.v1.tls_certificates
|
||||||
|
1261
lib/charms/tls_certificates_interface/v1/tls_certificates.py
Normal file
1261
lib/charms/tls_certificates_interface/v1/tls_certificates.py
Normal file
File diff suppressed because it is too large
Load Diff
@ -6,9 +6,8 @@
|
|||||||
|
|
||||||
cryptography
|
cryptography
|
||||||
jinja2
|
jinja2
|
||||||
|
jsonschema
|
||||||
lightkube
|
lightkube
|
||||||
lightkube-models
|
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
|
|
||||||
|
@ -6,9 +6,5 @@
|
|||||||
|
|
||||||
coverage
|
coverage
|
||||||
mock
|
mock
|
||||||
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
|
||||||
|
@ -66,12 +66,13 @@ applications:
|
|||||||
trust: true
|
trust: true
|
||||||
resources:
|
resources:
|
||||||
ovn-sb-db-server-image: kolla/ubuntu-binary-ovn-sb-db-server:yoga
|
ovn-sb-db-server-image: kolla/ubuntu-binary-ovn-sb-db-server:yoga
|
||||||
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
|
||||||
@ -126,15 +127,15 @@ 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
|
||||||
|
|
||||||
- - vault:insecure-certificates
|
- - tls-operator:certificates
|
||||||
- ovn-relay:certificates
|
- ovn-relay:certificates
|
||||||
- - ovn-relay:ovsdb-cms
|
- - ovn-relay:ovsdb-cms
|
||||||
- ovn-central:ovsdb-cms
|
- ovn-central:ovsdb-cms
|
||||||
|
@ -65,7 +65,7 @@ target_deploy_status:
|
|||||||
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: '^$'
|
||||||
ovn-relay:
|
ovn-relay:
|
||||||
|
8
tox.ini
8
tox.ini
@ -115,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
|
||||||
@ -133,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}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user