Update the charm to work with renamed barbican-hsm interface

The barbican-hsm-plugin interface was changed to barbican-hsm.
This commit is contained in:
Alex Kavanagh 2016-07-13 16:43:08 +00:00
parent bacbfac125
commit a1d134bccd
4 changed files with 8 additions and 8 deletions

View File

@ -10,7 +10,7 @@ Systems. It is intended to provide a example on how to plug an HSM into
Barbican. Barbican.
In particular, the SoftHSM2 plugin charm (as a subordinate) implements the In particular, the SoftHSM2 plugin charm (as a subordinate) implements the
barbican-hsm-plugin interface which transfers the credentials to the Barbican barbican-hsm interface which transfers the credentials to the Barbican
charm to be able to access the the HSM. charm to be able to access the the HSM.
From [the GitHub page](https://github.com/opendnssec/SoftHSMv2): From [the GitHub page](https://github.com/opendnssec/SoftHSMv2):
@ -46,11 +46,11 @@ http://bugs.launchpad.net/charms/+source/barbican/).
Barbican communicates with HSM devices via a local (to Barbican) PKCS11 Barbican communicates with HSM devices via a local (to Barbican) PKCS11
library. Thus an HSM plugin needs to be local to the unit that a Barbican is library. Thus an HSM plugin needs to be local to the unit that a Barbican is
installed on, and so a plugin charm is subordinate to the Barbican charm. A installed on, and so a plugin charm is subordinate to the Barbican charm. A
plugin provides the barbican-hsm-plugin interface that provides sufficient plugin provides the barbican-hsm interface that provides sufficient
details to the Barbican charm to be able to configure barbican to access the details to the Barbican charm to be able to configure barbican to access the
HSM's PKCS11 libary. HSM's PKCS11 libary.
The barbican-hsm-plugin interface transfers `login`, `slot_id` and The barbican-hsm interface transfers `login`, `slot_id` and
`library_path` parameters to the Barbican charm, which uses them to configure `library_path` parameters to the Barbican charm, which uses them to configure
Barbican to access the PKCS11 compliant library of the HSM. Barbican to access the PKCS11 compliant library of the HSM.

View File

@ -1,4 +1,4 @@
includes: ['layer:openstack', 'interface:barbican-hsm-plugin'] includes: ['layer:openstack', 'interface:barbican-hsm']
options: options:
basic: basic:
use_venv: True use_venv: True

View File

@ -5,12 +5,12 @@ subordinate: true
description: | description: |
Barbican provides a secure storage for keys and other secrets and Barbican provides a secure storage for keys and other secrets and
additionally has features to provide certificates to OpenStack applications. additionally has features to provide certificates to OpenStack applications.
The barbican-softhsm-plugin is for testing purposes only, and demonstrates The barbican-softhsm is for testing purposes only, and demonstrates
the barbican-hsm-plugin interface for interfacing real HSM providers with the barbican-hsm interface for interfacing real HSM providers with
Barbican. Barbican.
provides: provides:
hsm: hsm:
interface: barbican-hsm-plugin interface: barbican-hsm
scope: container scope: container
requires: requires:
juju-info: juju-info:

View File

@ -32,7 +32,7 @@ basepython = python3.5
deps = -r{toxinidir}/test-requirements.txt deps = -r{toxinidir}/test-requirements.txt
commands = ostestr {posargs} commands = ostestr {posargs}
[testenv:lint] [testenv:pep8]
basepython = python2.7 basepython = python2.7
deps = -r{toxinidir}/test-requirements.txt deps = -r{toxinidir}/test-requirements.txt
commands = flake8 {posargs} src commands = flake8 {posargs} src