diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-03-07 18:23:11 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-03-07 18:23:11 +0000 |
| commit | 23af156a77a631416fd151bcdaab22b4d268018a (patch) | |
| tree | 56047593d8f8b785cb00d2c1565db024ed7aa9c2 /nova/virt | |
| parent | 436282fad2b5ab4dfc69b49442aaedd8d123f1e8 (diff) | |
| parent | 813ed1b61de925f0385527aac096e88ea87c8802 (diff) | |
Merge "Read baremetal images from extra_specs namespace."
Diffstat (limited to 'nova/virt')
| -rw-r--r-- | nova/virt/baremetal/pxe.py | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/nova/virt/baremetal/pxe.py b/nova/virt/baremetal/pxe.py index fe92399ca..5d97298ca 100644 --- a/nova/virt/baremetal/pxe.py +++ b/nova/virt/baremetal/pxe.py @@ -150,12 +150,12 @@ def build_network_config(network_info): def get_deploy_aki_id(instance_type): return instance_type.get('extra_specs', {}).\ - get('deploy_kernel_id', CONF.baremetal.deploy_kernel) + get('baremetal:deploy_kernel_id', CONF.baremetal.deploy_kernel) def get_deploy_ari_id(instance_type): return instance_type.get('extra_specs', {}).\ - get('deploy_ramdisk_id', CONF.baremetal.deploy_ramdisk) + get('baremetal:deploy_ramdisk_id', CONF.baremetal.deploy_ramdisk) def get_image_dir_path(instance): @@ -423,8 +423,9 @@ class PXE(base.NodeDriver): # NOTE(danms): the instance_type extra_specs do not need to be # present/correct at deactivate time, so pass something empty # to avoid an extra lookup - instance_type = dict(extra_specs=dict(deploy_ramdisk_id='ignore', - deploy_kernel_id='ignore')) + instance_type = dict(extra_specs={ + 'baremetal:deploy_ramdisk_id': 'ignore', + 'baremetal:deploy_kernel_id': 'ignore'}) try: image_info = get_tftp_image_info(instance, instance_type) except exception.NovaException: |