else: raise
class KSWriter():
- def __init__(self, configs=None, repos=None, outdir=".", config=None, packages=False):
+ def __init__(self, configs=None, repos=None, outdir=".", config=None, packages=False, external=[]):
self.dist = None
self.arch = None
self.image_filename = os.path.abspath(os.path.expanduser(configs))
self.outdir = outdir
+ self.external = external
self.packages = packages
self.config = config
self.image_stream = file(self.image_filename, 'r')
self.process_files(conf, self.repos)
else:
print "%s is inactive, not generating %s at this time" %(img['Name'], img['FileName'] )
- for path in self.image_meta['ExternalConfigs']:
+
+ external = []
+ if self.external:
+ external = external + self.external
+ if self.image_meta.has_key('ExternalConfigs') and self.image_meta['ExternalConfigs']:
+ external = external + self.image_meta['ExternalConfigs']
+
+ for path in external:
external_config_dir = os.path.join(os.path.dirname(self.image_filename), path)
+ if not os.path.exists(external_config_dir):
+ external_config_dir = os.path.abspath(os.path.expanduser(path))
+
for f in os.listdir(external_config_dir):
if f.endswith('.yaml'):
fp = file('%s/%s' %(external_config_dir, f), 'r')
if image_meta.has_key('Configurations'):
for img in image_meta['Configurations']:
image_xml(root,img)
- for path in image_meta['ExternalConfigs']:
+ external = []
+ if self.external:
+ external = external + self.external
+ if self.image_meta.has_key('ExternalConfigs') and self.image_meta['ExternalConfigs']:
+ external = external + self.image_meta['ExternalConfigs']
+ for path in external:
for f in os.listdir(path):
if f.endswith('.yaml'):
fp = file('%s/%s' %(path, f), 'r')
print "you need to provide meta files with --configs and --repos"
sys.exit(1)
- ks = KSWriter(options.configsfile, options.repofile, options.outdir, options.config, options.packages)
+ ks = KSWriter(options.configsfile, options.repofile, options.outdir, options.config, options.packages, options.external)
ks.generate()
if options.indexfile:
- str = create_xml(ks.image_meta)
+ str = create_xml(ks.image_meta, options.external)
f = open(options.indexfile, 'w')
f.write(str)
f.close()