Merge ~kos.tsakalozos/charm-graylog:master into ~graylog-charmers/charm-graylog:master
Status: | Merged |
---|---|
Approved by: | Tom Haddon |
Approved revision: | 09296a7cedc2e24208e22e0c76204b4884b97bfd |
Merged at revision: | 55adc8c0826dc05c6ff6f85f34f63c952d8c48b2 |
Proposed branch: | ~kos.tsakalozos/charm-graylog:master |
Merge into: | ~graylog-charmers/charm-graylog:master |
Diff against target: |
10 lines (+1/-1) 1 file modified
actions/actions.py (+1/-1) |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Stuart Bishop (community) | Approve | ||
Review via email:
|
Commit message
Use charm-env to have access to venv in actions
Description of the change
The base layer changed recently its default behaviour that had to do with venvs [1]. By default venv [2] is now set to true.
As a result the charm actions now need to use the charms venv to have access to for example charmhelpers.
Without this patch actions fail with:
'''
2018-03-16 11:19:34 DEBUG show-admin-password Traceback (most recent call last):
2018-03-16 11:19:34 DEBUG show-admin-password File "/var/lib/
2018-03-16 11:19:34 DEBUG show-admin-password from charms import reactive # noqa E402
2018-03-16 11:19:34 DEBUG show-admin-password ImportError: cannot import name 'reactive'
'''
[1] https:/
[2] https:/
Yes, this is the preferred solution.