diff options
| author | Ben Howard <ben.howard@canonical.com> | 2014-02-07 10:10:02 +0200 |
|---|---|---|
| committer | Ben Howard <ben.howard@canonical.com> | 2014-02-07 10:10:02 +0200 |
| commit | 3087da32ec5cf84c51e0ebdd80a71a84b174a392 (patch) | |
| tree | 1918a08395e97dbd84bbf43c65c5740bf4ee3365 /cloudinit/handlers | |
| parent | 4fe439b9e137e0b59d00e919dc16aea9da35082a (diff) | |
| parent | 3cfe9b3d8958b1a4e450d5ff31d805c424945027 (diff) | |
| download | vyos-cloud-init-3087da32ec5cf84c51e0ebdd80a71a84b174a392.tar.gz vyos-cloud-init-3087da32ec5cf84c51e0ebdd80a71a84b174a392.zip | |
Rebase on upstream
Diffstat (limited to 'cloudinit/handlers')
| -rw-r--r-- | cloudinit/handlers/__init__.py | 4 | ||||
| -rw-r--r-- | cloudinit/handlers/cloud_config.py | 2 | ||||
| -rw-r--r-- | cloudinit/handlers/shell_script.py | 2 |
3 files changed, 8 insertions, 0 deletions
diff --git a/cloudinit/handlers/__init__.py b/cloudinit/handlers/__init__.py index 2ddc75f4..059d7495 100644 --- a/cloudinit/handlers/__init__.py +++ b/cloudinit/handlers/__init__.py @@ -187,6 +187,10 @@ def _escape_string(text): def walker_callback(data, filename, payload, headers): content_type = headers['Content-Type'] + if content_type in data.get('excluded'): + LOG.debug('content_type "%s" is excluded', content_type) + return + if content_type in PART_CONTENT_TYPES: walker_handle_handler(data, content_type, filename, payload) return diff --git a/cloudinit/handlers/cloud_config.py b/cloudinit/handlers/cloud_config.py index 34a73115..4232700f 100644 --- a/cloudinit/handlers/cloud_config.py +++ b/cloudinit/handlers/cloud_config.py @@ -66,6 +66,8 @@ class CloudConfigPartHandler(handlers.Handler): handlers.Handler.__init__(self, PER_ALWAYS, version=3) self.cloud_buf = None self.cloud_fn = paths.get_ipath("cloud_config") + if 'cloud_config_path' in _kwargs: + self.cloud_fn = paths.get_ipath(_kwargs["cloud_config_path"]) self.file_names = [] def list_types(self): diff --git a/cloudinit/handlers/shell_script.py b/cloudinit/handlers/shell_script.py index 62289d98..30c1ed89 100644 --- a/cloudinit/handlers/shell_script.py +++ b/cloudinit/handlers/shell_script.py @@ -36,6 +36,8 @@ class ShellScriptPartHandler(handlers.Handler): def __init__(self, paths, **_kwargs): handlers.Handler.__init__(self, PER_ALWAYS) self.script_dir = paths.get_ipath_cur('scripts') + if 'script_path' in _kwargs: + self.script_dir = paths.get_ipath_cur(_kwargs['script_path']) def list_types(self): return [ |