Merge lp:~lutostag/juju-wait/juju-model-env-var into lp:~stub/juju-wait/trunk-migrated-to-git

Proposed by Greg Lutostanski
Status: Merged
Merged at revision: 43
Proposed branch: lp:~lutostag/juju-wait/juju-model-env-var
Merge into: lp:~stub/juju-wait/trunk-migrated-to-git
Diff against target: 12 lines (+2/-0)
1 file modified
juju_wait/__init__.py (+2/-0)
To merge this branch: bzr merge lp:~lutostag/juju-wait/juju-model-env-var
Reviewer Review Type Date Requested Status
Stuart Bishop Approve
Review via email: mp+306232@code.launchpad.net

Description of the change

set JUJU_MODEL to allow setting specific model for 2.x, works with same cmdline parameters

To post a comment you must log in.
Revision history for this message
Greg Lutostanski (lutostag) wrote :

from man juju:
```
JUJU_MODEL
              Provides a way for the shell environment to specify the current Juju model to use. If the model is specified explicitly using -m MODEL, this takes precedence.
```

Revision history for this message
Stuart Bishop (stub) wrote :

Yup. Ta.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'juju_wait/__init__.py'
2--- juju_wait/__init__.py 2016-09-12 23:15:03 +0000
3+++ juju_wait/__init__.py 2016-09-20 14:58:11 +0000
4@@ -40,6 +40,8 @@
5 class EnvironmentAction(argparse.Action):
6 def __call__(self, parser, namespace, values, option_string=None):
7 os.environ['JUJU_ENV'] = values[0]
8+ # also set JUJU_MODEL environment variable for juju 2.x
9+ os.environ['JUJU_MODEL'] = values[0]
10
11
12 def parse_ts(ts):

Subscribers

People subscribed via source and target branches