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/sources/DataSourceEc2.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/sources/DataSourceEc2.py')
| -rw-r--r-- | cloudinit/sources/DataSourceEc2.py | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/cloudinit/sources/DataSourceEc2.py b/cloudinit/sources/DataSourceEc2.py index 2db53446..f010e640 100644 --- a/cloudinit/sources/DataSourceEc2.py +++ b/cloudinit/sources/DataSourceEc2.py @@ -49,9 +49,6 @@ class DataSourceEc2(sources.DataSource): self.seed_dir = os.path.join(paths.seed_dir, "ec2") self.api_ver = DEF_MD_VERSION - def __str__(self): - return util.obj_name(self) - def get_data(self): seed_ret = {} if util.read_optional_seed(seed_ret, base=(self.seed_dir + "/")): |