Merge lp:~ack/charms/precise/landscape-client/separate-juju-info into lp:charms/landscape-client

[Alberto Donato]

Replace the use of meta-data.d for juju information, putting them in landscape-client $data_path/juju-info.json file instead.

[Fernando Correa Neto (fcorrea)]

Looks good! +1

review: Approve

[Chris Glass (tribaal)]

Looks good. +1

review: Approve

[lp:~ack/charms/precise/landscape-client/separate-juju-info]

28. By Alberto Donato on 2013-09-19

Drop juju-info directory, make it a json file instead.

29. By Alberto Donato on 2013-09-19

Use a dict comprehension (from fcorrea's review).

30. By Alberto Donato on 2013-09-20

No need to filter empty values.

Unmerged revisions

=== modified file 'hooks/common.py'
--- hooks/common.py	2013-06-12 13:46:25 +0000
+++ hooks/common.py	2013-09-19 17:13:10 +0000
@@ -137,3 +137,9 @@
     """Change file owner and group to landscape."""
     user = getpwnam("landscape")
     os.chown(filename, user.pw_uid, user.pw_gid)
+
+
+def write_json_file(filename, content):
+    """Dump content in JSON format to the specified file."""
+    with open(filename, "w") as dumpfile:
+        json.dump(content, dumpfile)

=== modified file 'hooks/container-relation-joined'
--- hooks/container-relation-joined	2013-06-20 12:40:36 +0000
+++ hooks/container-relation-joined	2013-09-19 17:13:10 +0000
@@ -4,7 +4,8 @@
 import sys
 
 from common import (
-    get_client_config, update_client_config, get_relation_config, chown)
+    get_client_config, update_client_config, get_relation_config, chown,
+    write_json_file)
 
 
 exit_code = update_client_config(
@@ -14,22 +15,14 @@
 relation_conf = get_relation_config()
 # 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 = {"juju-env-uuid": os.environ.get("JUJU_ENV_UUID"),
-             "juju-unit-name": os.environ.get("JUJU_REMOTE_UNIT"),
-             "juju-api-addresses": os.environ.get("JUJU_API_ADDRESSES"),
-             "juju-private-address": relation_conf.get("private-address")}
-
-# Temporary workaround until the new client is released. It provides
-# meta_data_path as a config option.
-meta_data_dir = os.path.join(client_config.data_path, "meta-data.d")
-
-meta_data_dir = getattr(client_config, "meta_data_path", meta_data_dir)
-for key, value in juju_info.items():
-    if not value:
-        continue
-    filename = os.path.join(meta_data_dir, key)
-    with open(filename, "w") as juju_info_file:
-        juju_info_file.write(value)
-    chown(filename)
+juju_info = {"environment-uuid": os.environ.get("JUJU_ENV_UUID"),
+             "unit-name": os.environ.get("JUJU_REMOTE_UNIT"),
+             "api-addresses": os.environ.get("JUJU_API_ADDRESSES"),
+             "private-address": relation_conf.get("private-address")}
+juju_info = dict((key, value) for key, value in juju_info.iteritems() if value)
+
+juju_info_file = os.path.join(client_config.data_path, "juju-info.json")
+write_json_file(juju_info_file, juju_info)
+chown(juju_info_file)
 
 sys.exit(exit_code)

=== modified file 'hooks/install'
--- hooks/install	2013-06-14 15:08:04 +0000
+++ hooks/install	2013-09-19 17:13:10 +0000
@@ -89,6 +89,5 @@
 # released.
 make_tree() {
     install -o landscape -g root -m 755 -d "$DATA_PATH"
-    install -o landscape -g landscape -m 755 -d "$DATA_PATH"/meta-data.d
 }
 landscape-config --init -d "$DATA_PATH" || make_tree