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

network config for ci

See merge request !3

disk.py

@@ -193,23 +193,27 @@ class Disk(object):
                     return True
                     return True
         return False
         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
         tmp_dir = self.dir + '/dir' + self.name
         os.mkdir(tmp_dir)
         os.mkdir(tmp_dir)
         meta_path = tmp_dir + '/meta-data'
         meta_path = tmp_dir + '/meta-data'
         user_path = tmp_dir + '/user-data'
         user_path = tmp_dir + '/user-data'
+        net_path = tmp_dir + '/network-config'
         with open(meta_path, 'w') as f:
         with open(meta_path, 'w') as f:
             f.write(meta_data)
             f.write(meta_data)
         with open(user_path, 'w') as f:
         with open(user_path, 'w') as f:
             f.write(user_data)
             f.write(user_data)
+        with open(net_path, 'w') as f:
+            f.write(network_data)
         cmdline = ['genisoimage',
         cmdline = ['genisoimage',
                    '-output', self.get_path(),
                    '-output', self.get_path(),
                    '-V', 'cidata', '-r', '-J',
                    '-V', 'cidata', '-r', '-J',
                    meta_path,
                    meta_path,
-                   user_path]
+                   user_path, net_path]
         subprocess.check_output(cmdline)
         subprocess.check_output(cmdline)
         os.remove(meta_path)
         os.remove(meta_path)
         os.remove(user_path)
         os.remove(user_path)
+        os.remove(net_path)
         os.removedirs(tmp_dir)
         os.removedirs(tmp_dir)
         self.size = Disk.get(self.dir, self.name).size
         self.size = Disk.get(self.dir, self.name).size
 
 

storagedriver.py

@@ -29,9 +29,9 @@ def create(disk_desc):
 
 
 
 
 @celery.task()
 @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 = 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,
     return {'size': disk.size,
                 'type': 'raw-ro',
                 'type': 'raw-ro',
                 'checksum': disk.checksum, }
                 'checksum': disk.checksum, }