Vish, while I'd honestly prefer one or the other, not both, it doesn't matter significantly. Overall, I'd prefer to establish a blueprint for something more flexible and revamping the entire injection mechanism.
Performing further code review, I think we also need the following:
=== modified file 'nova/virt/xenapi/vm_utils.py'
--- nova/virt/xenapi/vm_utils.py 2011-08-19 15:50:48 +0000
+++ nova/virt/xenapi/vm_utils.py 2011-08-22 19:43:08 +0000
@@ -742,7 +742,7 @@
# everything mount_required = False
key, net, metadata = _prepare_injectables(instance, network_info)
- mount_required = key or net
+ mount_required = key or net or metadata
if not mount_required:
return
Vish, while I'd honestly prefer one or the other, not both, it doesn't matter significantly. Overall, I'd prefer to establish a blueprint for something more flexible and revamping the entire injection mechanism.
Performing further code review, I think we also need the following:
=== modified file 'nova/virt/ xenapi/ vm_utils. py' xenapi/ vm_utils. py 2011-08-19 15:50:48 +0000 xenapi/ vm_utils. py 2011-08-22 19:43:08 +0000
mount_ required = False injectables( instance, network_info)
--- nova/virt/
+++ nova/virt/
@@ -742,7 +742,7 @@
# everything
key, net, metadata = _prepare_
- mount_required = key or net
+ mount_required = key or net or metadata
if not mount_required:
return