openstack
/
charm-ceph-osd
Code Issues Proposed changes

Merge "Ensure python3-hvac is installed for charms with encypt option"

This commit is contained in:
Zuul 2020-02-20 12:16:16 +00:00 committed by Gerrit Code Review
parent d38e26e819 8b2e85e435
commit 81a11f4d7f
1 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
hooks/charmhelpers/contrib/openstack/vaultlocker.py
View File

@ -37,7 +37,19 @@ class VaultKVContext(context.OSContextGenerator):
)
def __call__(self):
import hvac
try:
import hvac
except ImportError:
# BUG: #1862085 - if the relation is made to vault, but the
# 'encrypt' option is not made, then the charm errors with an
# import warning. This catches that, logs a warning, and returns
# with an empty context.
hookenv.log("VaultKVContext: trying to use hvac pythong module "
"but it's not available. Is secrets-stroage relation "
"made, but encrypt option not set?",
level=hookenv.WARNING)
# return an emptry context on hvac import error
return {}
ctxt = {}
# NOTE(hopem): see https://bugs.launchpad.net/charm-helpers/+bug/1849323
db = unitdata.kv()