diff options
Diffstat (limited to 'cloudinit/DataSourceOVF.py')
| -rw-r--r-- | cloudinit/DataSourceOVF.py | 23 |
1 files changed, 15 insertions, 8 deletions
diff --git a/cloudinit/DataSourceOVF.py b/cloudinit/DataSourceOVF.py index 3fba878b..31d0c407 100644 --- a/cloudinit/DataSourceOVF.py +++ b/cloudinit/DataSourceOVF.py @@ -18,7 +18,7 @@ import DataSource -import cloudinit +from cloudinit import seeddir import cloudinit.util as util import sys import os.path @@ -33,16 +33,13 @@ import subprocess class DataSourceOVF(DataSource.DataSource): seed = None - seeddir = cloudinit.seeddir + '/ovf' + seeddir = seeddir + '/ovf' environment = None cfg = { } userdata_raw = None metadata = None supported_seed_starts = ( "/" , "file://" ) - def __init__(self): - pass - def __str__(self): mstr="DataSourceOVF" mstr = mstr + " [seed=%s]" % self.seed @@ -90,12 +87,12 @@ class DataSourceOVF(DataSource.DataSource): seedfound = proto break if not seedfound: - cloudinit.log.debug("seed from %s not supported by %s" % + self.log.debug("seed from %s not supported by %s" % (seedfrom, self.__class__)) return False (md_seed,ud) = util.read_seeded(seedfrom) - cloudinit.log.debug("using seeded cache data from %s" % seedfrom) + self.log.debug("using seeded cache data from %s" % seedfrom) md = util.mergedict(md,md_seed) found.append(seedfrom) @@ -122,7 +119,7 @@ class DataSourceOVF(DataSource.DataSource): return(self.cfg) class DataSourceOVFNet(DataSourceOVF): - seeddir = cloudinit.seeddir + '/ovf-net' + seeddir = seeddir + '/ovf-net' supported_seed_starts = ( "http://", "https://", "ftp://" ) # this will return a dict with some content @@ -283,6 +280,16 @@ def getProperties(environString): return(props) +datasources = ( + ( DataSourceOVF, ( DataSource.DEP_FILESYSTEM, ) ), + ( DataSourceOVFNet, + ( DataSource.DEP_FILESYSTEM, DataSource.DEP_NETWORK ) ), +) + +# return a list of data sources that match this set of dependencies +def get_datasource_list(depends): + return(DataSource.list_from_depends(depends, datasources)) + if __name__ == "__main__": import sys envStr = open(sys.argv[1]).read() |