diff options
| author | Scott Moser <smoser@ubuntu.com> | 2013-03-07 17:15:07 -0500 |
|---|---|---|
| committer | Scott Moser <smoser@ubuntu.com> | 2013-03-07 17:15:07 -0500 |
| commit | 973747b00af47c94ba0a719452aa823fb688e5ab (patch) | |
| tree | 647bbe6715ffd164726186a1fb4dfef7e6d483d9 /cloudinit/handlers/shell_script.py | |
| parent | 8013c284e82349246b2274f5475c138323fd7c55 (diff) | |
| parent | 5da3984c2ca9e94b2483ab89ecdb5c93b5afb9f8 (diff) | |
| download | vyos-cloud-init-973747b00af47c94ba0a719452aa823fb688e5ab.tar.gz vyos-cloud-init-973747b00af47c94ba0a719452aa823fb688e5ab.zip | |
support different and user-suppliable merging algorithms for cloud-config
This adds a very useful mechanism for merging cloud-config, allowing
the user to append to lists (ie, just add more 'run_cmd') or other
things.
See doc/merging.txt for more information, it is intended to be backwards
compatible by default.
LP: #1023179
Diffstat (limited to 'cloudinit/handlers/shell_script.py')
| -rw-r--r-- | cloudinit/handlers/shell_script.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/cloudinit/handlers/shell_script.py b/cloudinit/handlers/shell_script.py index 6c5c11ca..b185c374 100644 --- a/cloudinit/handlers/shell_script.py +++ b/cloudinit/handlers/shell_script.py @@ -41,7 +41,8 @@ class ShellScriptPartHandler(handlers.Handler): handlers.type_from_starts_with("#!"), ] - def _handle_part(self, _data, ctype, filename, payload, _frequency): + def handle_part(self, _data, ctype, filename, # pylint: disable=W0221 + payload, frequency): # pylint: disable=W0613 if ctype in handlers.CONTENT_SIGNALS: # TODO(harlowja): maybe delete existing things here return |