summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2014-03-27 23:22:27 +0000
committerGerrit Code Review <review@openstack.org>2014-03-27 23:22:27 +0000
commit329f9fdc2bd6b023d63ffb2ec3ca2ed245984501 (patch)
tree0a42d9e675c1491a434561e35f09a447d8c8e2c0
parentf1e702c35719407db0a77684294cdb4e73a461c3 (diff)
parenta244d1bc7b67c13db31de4830036a7829906655e (diff)
downloadironic-329f9fdc2bd6b023d63ffb2ec3ca2ed245984501.tar.gz
Merge "Nova Ironic driver to set pxe_swap_mb in Ironic"
-rw-r--r--ironic/nova/virt/ironic/ironic_driver_fields.py4
1 files changed, 4 insertions, 0 deletions
diff --git a/ironic/nova/virt/ironic/ironic_driver_fields.py b/ironic/nova/virt/ironic/ironic_driver_fields.py
index 434c2a66c..49562cc34 100644
--- a/ironic/nova/virt/ironic/ironic_driver_fields.py
+++ b/ironic/nova/virt/ironic/ironic_driver_fields.py
@@ -42,6 +42,10 @@ class PXE(object):
'nova_object': 'instance',
'object_field': 'root_gb'},
{'ironic_path': '/driver_info',
+ 'ironic_variable': 'pxe_swap_mb',
+ 'nova_object': 'flavor',
+ 'object_field': 'swap'},
+ {'ironic_path': '/driver_info',
'ironic_variable': 'pxe_deploy_kernel',
'nova_object': 'flavor',
'object_field': 'extra_specs/'