Sfoglia il codice sorgente

Merged in aznashwan/coriolis/nics_dhcp_config (pull request #48)

Added 'nics_set_dhcp' parameter to providers osmorphing_info.
Nashwan Azhari 9 anni fa
parent
commit
e86da5add9

+ 2 - 1
coriolis/osmorphing/manager.py

@@ -71,7 +71,8 @@ def morph_image(origin_provider, destination_provider, connection_info,
         import_os_morphing_tools.pre_packages_install(packages_add)
 
         nics_info = osmorphing_info.get('nics_info')
-        import_os_morphing_tools.set_net_config(nics_info, dhcp=True)
+        set_dhcp = osmorphing_info.get('nics_set_dhcp', True)
+        import_os_morphing_tools.set_net_config(nics_info, dhcp=set_dhcp)
         LOG.info("Pre packages")
 
         if packages_add:

+ 4 - 0
coriolis/schemas/vm_import_info_schema.json

@@ -44,6 +44,10 @@
             "type": "object"
           }
         },
+        "nics_set_dhcp": {
+          "type": "boolean",
+          "default": "true"
+        },
         "ignore_devices": {
           "type": "array",
           "items": {