Merge lp:~michael.nelson/charms/trusty/landscape-client/fix-juju2-env-uuiD into lp:charms/trusty/landscape-client

[Michael Nelson]

Allow the juju2 JUJU_MODEL_UUID to be used if the (juju1) JUJU_ENV_UUID is not available.

AFAICT, the landscape-client charm depends on the juju 1.x env variable JUJU_ENV_UUID: http://paste.ubuntu.com/23938838/

I checked the juju source to verify the env var name: http://paste.ubuntu.com/23939030/

To fix my existing units, I had to upgrade-charm and then:

$ juju run --application landscape hooks/container-relation-joined

One thing concerns me, and that is that PaulGear mentioned he checked a juju2 environment which is using the landscape-client charm and it was fine (without this patch).

[Francis Ginther (fginther)]

This fix is already in https://code.launchpad.net/~landscape/landscape-client-charm/trunk which supports both trusty and xenial. It is also in the lastest charm store revisions:

cs:trusty/landscape-client-14
cs:xenial/landscape-client-1

The MP which addresses this issue is https://code.launchpad.net/~adam-collard/landscape-client-charm/juju-2-support/+merge/295697.

It looks like this branch just needs to be retired (although that would likely impact numerous existing mojo specs). Will dig a little on what the right answer should be here.

[Michael Nelson (michael.nelson)]

Hmm. In our internal deployments (sorry for the internal link), we have a total of 74 separate deployments which reference the apparently unmaintained lp:charms/trusty/landscape-client . I wonder if it'd be worth merging all the recent changes there?

https://pastebin.canonical.com/178394/

[Michael Nelson (michael.nelson)]

I'm happy to switch to the cs version too, for my own deployment, but would baulk at updating all 74 in the paste above.

Unmerged revisions

56. By Michael Nelson on 2017-02-06

Add support for juju2's JUJU_MODEL_UUID

=== modified file 'hooks/hooks.py'
--- hooks/hooks.py	2016-03-30 20:04:13 +0000
+++ hooks/hooks.py	2017-02-06 04:54:58 +0000
@@ -69,10 +69,16 @@
     juju_broker.log("In container-relation-joined for %s"
                     "" % landscape_broker.local_unit)
     landscape_broker.config.reload()
+
+    # juju1 uses JUJU_ENV_UUID in hook contexts, whereas juju2 JUJU_MODE_UUID
+    env_uuid = juju_broker.environment.get(
+        "JUJU_ENV_UUID", juju_broker.environment.get(
+            "JUJU_MODEL_UUID"))
+
     # We use the remote unit for the unit name, since we want to associate this
     # client with the unit it's managing, not its own unit.
     juju_info = {
-        "environment-uuid": juju_broker.environment.get("JUJU_ENV_UUID"),
+        "environment-uuid": env_uuid,
         "machine-id": juju_broker.get_machine_id(),
         "api-addresses": juju_broker.environment.get("JUJU_API_ADDRESSES")}