Merge lp:~therve/cloud-init/fix-landscape-config into lp:~cloud-init-dev/cloud-init/trunk

[Thomas Herve]

The branch adds the RUN=1 bit to the default file, so that the client starts properly once configured.

[Scott Moser (smoser)]

Thomas,
  Doesn't this cause us to write /etc/default/landscape-client unless there is invalid provided in user-data ?

  If I understand the current code correctly, we basically no-op if there is no 'landscape' section in cloud-config. (it is a long-winded no-op, but the end result is nothing changed). However, with your change here, we'd be modifying /etc/default/landscape-client always, without concern of its original content.

[lp:~therve/cloud-init/fix-landscape-config]

646. By Thomas Herve on 2012-09-05

Check if the config was specified

[Thomas Herve (therve)]

You're right, I missed that part. I added one conditional to check the config.

=== modified file 'cloudinit/config/cc_landscape.py'
--- cloudinit/config/cc_landscape.py	2012-06-22 15:50:19 +0000
+++ cloudinit/config/cc_landscape.py	2012-09-05 16:58:18 +0000
@@ -31,6 +31,7 @@
 frequency = PER_INSTANCE
 
 LSC_CLIENT_CFG_FILE = "/etc/landscape/client.conf"
+LS_DEFAULT_FILE = "/etc/default/landscape-client"
 
 distros = ['ubuntu']
 
@@ -78,6 +79,9 @@
     util.write_file(lsc_client_fn, contents.getvalue())
     log.debug("Wrote landscape config file to %s", lsc_client_fn)
 
+    if ls_cloudcfg:
+        util.write_file(LS_DEFAULT_FILE, "RUN=1\n")
+
 
 def merge_together(objs):
     """