Commit 2b5fe878 by Szeberényi Imre

Merge branch 'add-network-data' into 'master'

network config for ci

See merge request !3
parents 6b3d5ad3 3e753504
......@@ -193,23 +193,27 @@ class Disk(object):
return True
return False
def create_ci_disk(self, meta_data, user_data):
def create_ci_disk(self, meta_data, user_data, network_data):
tmp_dir = self.dir + '/dir' + self.name
os.mkdir(tmp_dir)
meta_path = tmp_dir + '/meta-data'
user_path = tmp_dir + '/user-data'
net_path = tmp_dir + '/network-config'
with open(meta_path, 'w') as f:
f.write(meta_data)
with open(user_path, 'w') as f:
f.write(user_data)
with open(net_path, 'w') as f:
f.write(network_data)
cmdline = ['genisoimage',
'-output', self.get_path(),
'-V', 'cidata', '-r', '-J',
meta_path,
user_path]
user_path, net_path]
subprocess.check_output(cmdline)
os.remove(meta_path)
os.remove(user_path)
os.remove(net_path)
os.removedirs(tmp_dir)
self.size = Disk.get(self.dir, self.name).size
......
......@@ -29,9 +29,9 @@ def create(disk_desc):
@celery.task()
def create_ci_disk(disk_desc, meta_data, user_data):
def create_ci_disk(disk_desc, meta_data, user_data, network_data):
disk = Disk.deserialize(disk_desc)
disk.create_ci_disk(meta_data=meta_data, user_data=user_data)
disk.create_ci_disk(meta_data=meta_data, user_data=user_data, network_data=network_data)
return {'size': disk.size,
'type': 'raw-ro',
'checksum': disk.checksum, }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment