openstack
/
charm-barbican-vault
Code Issues Proposed changes

Base64-decoding of certificate moved to vault-kv interface code

This commit is contained in:
Frode Nordahl 2018-10-24 09:59:38 +02:00
parent 63af9a89b3
commit d062d3460b
No known key found for this signature in database
GPG Key ID: 6A5D59A3BA48373F
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/lib/charm/openstack/barbican_vault.py
View File

@ -11,7 +11,6 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
import base64
import charms_openstack.adapters
import charms_openstack.charm
@ -31,16 +30,14 @@ class BarbicanVaultCharm(charms_openstack.charm.OpenStackCharm):
def install_ca_cert(self, ca_cert_data):
"""Install CA certificate.
Takes Base64 encoded data from caller and installs it building
filename from application name in Juju model.
Takes certificate data from caller and installs it building filename
from application name in Juju model.
:param ca_cert_data: Base64 encoded certificate data
:param ca_cert_data: Certificate data
:type ca_cert_data: str
:
"""
name = 'juju-' + self.configuration_class().application_name
ch_core.host.install_ca_cert(
base64.b64decode(ca_cert_data), name=name)
ch_core.host.install_ca_cert(ca_cert_data, name=name)
self._installed_ca_name = (
'/usr/local/share/ca-certificates/{}.crt'.format(name))