← Back to team overview

cloud-init-dev team mailing list archive

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


Thomas Herve has proposed merging lp:~therve/cloud-init/fix-landscape-config into lp:cloud-init.

Requested reviews:
  cloud init development team (cloud-init-dev)
Related bugs:
  Bug #1042758 in cloud-init: "landscape handler needs to set RUN=1 in /etc/default/landscape-client"

For more details, see:

The branch adds the RUN=1 bit to the default file, so that the client starts properly once configured.
Your team cloud init development team is requested to review the proposed merge of lp:~therve/cloud-init/fix-landscape-config into lp:cloud-init.
=== 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 13:19:23 +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,8 @@
     util.write_file(lsc_client_fn, contents.getvalue())
     log.debug("Wrote landscape config file to %s", lsc_client_fn)
+    util.write_file(LS_DEFAULT_FILE, "RUN=1\n")
 def merge_together(objs):

Follow ups