summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorScott Moser <smoser@ubuntu.com>2012-09-14 16:31:04 -0400
committerScott Moser <smoser@ubuntu.com>2012-09-14 16:31:04 -0400
commitbc103ae9730922a3e8f8309b7f1a5e5443ee7142 (patch)
treec5ab0ab7f057161ea022dbd6284fd2aebc7cb30d
parentccea8913191c4039c58d562a6dd13ca1d9ef81c5 (diff)
parentc76daa63ecfa0901769f1cb8211465c06b33770c (diff)
downloadvyos-cloud-init-bc103ae9730922a3e8f8309b7f1a5e5443ee7142.tar.gz
vyos-cloud-init-bc103ae9730922a3e8f8309b7f1a5e5443ee7142.zip
only write landscape config if user-data provided
-rw-r--r--cloudinit/config/cc_landscape.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/cloudinit/config/cc_landscape.py b/cloudinit/config/cc_landscape.py
index d351d941..7cfb8296 100644
--- a/cloudinit/config/cc_landscape.py
+++ b/cloudinit/config/cc_landscape.py
@@ -79,7 +79,8 @@ def handle(_name, cfg, cloud, log, _args):
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")
+ if ls_cloudcfg:
+ util.write_file(LS_DEFAULT_FILE, "RUN=1\n")
def merge_together(objs):