Merge lp:~bjornt/charms/precise/landscape-client/fix-computer-title into lp:~charmers/charms/precise/landscape-client/trunk

[Björn Tillenius]

Don't try to use the remote unit name as computer title, since it's not
available in the config-changed hook.

When David prepared the official landscape-client charm he merged in my
branch that wasn't working yet. This change reverts that merge.

[James Page (james-page)]

review: Approve

=== modified file 'hooks/config-changed'
--- hooks/config-changed	2013-01-16 13:57:13 +0000
+++ hooks/config-changed	2013-01-18 06:59:56 +0000
@@ -17,7 +17,7 @@
 configs = json.loads(check_output(["config-get", "--format=json"]))
 if configs and not configured:
     if not configs.get("computer-title"):
-        configs["computer-title"] = os.environ["JUJU_REMOTE_UNIT"]
+        configs["computer-title"] = os.environ["JUJU_UNIT_NAME"]
     options = ["--%s=%s" % (key, value) for key, value in configs.items()]
 
     args = ["landscape-config", "--silent"]