diff options
| author | Scott Moser <smoser@ubuntu.com> | 2013-07-24 11:04:34 -0400 |
|---|---|---|
| committer | Scott Moser <smoser@ubuntu.com> | 2013-07-24 11:04:34 -0400 |
| commit | 82397d79f1c0618f25eab6e28e65b1e59a98603a (patch) | |
| tree | 282753410e972115da387fdef471f6563b5b3379 /cloudinit/handlers/cloud_config.py | |
| parent | eae3b6ad499b88b725a52cf07245e4721af380cf (diff) | |
| parent | 0891f6611d1c264220a6f71306802db1e70651fc (diff) | |
| download | vyos-cloud-init-82397d79f1c0618f25eab6e28e65b1e59a98603a.tar.gz vyos-cloud-init-82397d79f1c0618f25eab6e28e65b1e59a98603a.zip | |
merge from trunk
Diffstat (limited to 'cloudinit/handlers/cloud_config.py')
| -rw-r--r-- | cloudinit/handlers/cloud_config.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/cloudinit/handlers/cloud_config.py b/cloudinit/handlers/cloud_config.py index 4dcdbe8b..0f080e66 100644 --- a/cloudinit/handlers/cloud_config.py +++ b/cloudinit/handlers/cloud_config.py @@ -51,6 +51,7 @@ MERGE_HEADER = 'Merge-Type' # # This gets loaded into yaml with final result {'a': 22} DEF_MERGERS = mergers.string_extract_mergers('dict(replace)+list()+str()') +CLOUD_PREFIX = "#cloud-config" # The file header -> content types this module will handle. CC_TYPES = { @@ -84,7 +85,7 @@ class CloudConfigPartHandler(handlers.Handler): if self.cloud_buf is not None: # Something was actually gathered.... lines = [ - "#cloud-config", + CLOUD_PREFIX, '', ] lines.extend(file_lines) |