diff options
author | Scott Moser <smoser@brickies.net> | 2016-08-23 16:48:42 -0400 |
---|---|---|
committer | Scott Moser <smoser@brickies.net> | 2016-08-23 16:48:42 -0400 |
commit | 7bbcf311064a2da5c0b4838a414108ed45b1f6a8 (patch) | |
tree | ebae46ee3b1e4f3985b05a2609767cf973b00c32 | |
parent | 634e7285a3cf8268bbb262c2931d4498883a54d7 (diff) | |
parent | 6a20a7f0b2a65626c997d0f9264aa293cf4d21f0 (diff) | |
download | vyos-cloud-init-7bbcf311064a2da5c0b4838a414108ed45b1f6a8.tar.gz vyos-cloud-init-7bbcf311064a2da5c0b4838a414108ed45b1f6a8.zip |
merge trunk at 0.7.7~bzr1246
-rw-r--r-- | cloudinit/sources/__init__.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/cloudinit/sources/__init__.py b/cloudinit/sources/__init__.py index 2a6b8d90..87b8e524 100644 --- a/cloudinit/sources/__init__.py +++ b/cloudinit/sources/__init__.py @@ -55,6 +55,8 @@ class DataSourceNotFoundException(Exception): @six.add_metaclass(abc.ABCMeta) class DataSource(object): + dsmode = DSMODE_NETWORK + def __init__(self, sys_cfg, distro, paths, ud_proc=None): self.sys_cfg = sys_cfg self.distro = distro @@ -64,7 +66,6 @@ class DataSource(object): self.userdata_raw = None self.vendordata = None self.vendordata_raw = None - self.dsmode = DSMODE_NETWORK # find the datasource config name. # remove 'DataSource' from classname on front, and remove 'Net' on end. |