summaryrefslogtreecommitdiff
path: root/cloudinit/sources/DataSourceNone.py
diff options
context:
space:
mode:
authorScott Moser <smoser@ubuntu.com>2013-03-07 17:15:07 -0500
committerScott Moser <smoser@ubuntu.com>2013-03-07 17:15:07 -0500
commit973747b00af47c94ba0a719452aa823fb688e5ab (patch)
tree647bbe6715ffd164726186a1fb4dfef7e6d483d9 /cloudinit/sources/DataSourceNone.py
parent8013c284e82349246b2274f5475c138323fd7c55 (diff)
parent5da3984c2ca9e94b2483ab89ecdb5c93b5afb9f8 (diff)
downloadvyos-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/DataSourceNone.py')
-rw-r--r--cloudinit/sources/DataSourceNone.py4
1 files changed, 0 insertions, 4 deletions
diff --git a/cloudinit/sources/DataSourceNone.py b/cloudinit/sources/DataSourceNone.py
index c2125bee..12a8a992 100644
--- a/cloudinit/sources/DataSourceNone.py
+++ b/cloudinit/sources/DataSourceNone.py
@@ -18,7 +18,6 @@
from cloudinit import log as logging
from cloudinit import sources
-from cloudinit import util
LOG = logging.getLogger(__name__)
@@ -41,9 +40,6 @@ class DataSourceNone(sources.DataSource):
def get_instance_id(self):
return 'iid-datasource-none'
- def __str__(self):
- return util.obj_name(self)
-
@property
def is_disconnected(self):
return True