Merge pull request #61273 from juju-solutions/bug/actions-charm-env

Automatic merge from submit-queue (batch tested with PRs 60980, 61273, 60811, 61021, 61367). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>.

Use charm env in actions to get have charmhelpers available

**What this PR does / why we need it**: Due to changes in the base layer the actions in the Juju charms do not have access to charmhelpers in the default environment. This PR fixes this issue.

**Which issue(s) this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close the issue(s) when PR gets merged)*:
Fixes #

**Special notes for your reviewer**:

**Release note**:

```release-note
NONE
```
This commit is contained in:
Kubernetes Submit Queue 2018-03-22 02:08:16 -07:00 committed by GitHub
commit 5d2e4e2d0b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 4 additions and 4 deletions

View File

@ -1,4 +1,4 @@
#!/usr/bin/env python3
#!/usr/local/sbin/charm-env python3
# Copyright 2015 The Kubernetes Authors.
#

View File

@ -1,4 +1,4 @@
#!/usr/bin/env python3
#!/usr/local/sbin/charm-env python3
import os
from yaml import safe_load as load
from charmhelpers.core.hookenv import (

View File

@ -1,4 +1,4 @@
#!/usr/bin/env python3
#!/usr/local/sbin/charm-env python3
# Copyright 2015 The Kubernetes Authors.
#

View File

@ -1,4 +1,4 @@
#!/usr/bin/python3
#!/usr/local/sbin/charm-env python3
#
# For a usage examples, see README.md
#