libvirt: Use os_command_line when kernel_id is set
Patch Iad53c687053bdb5469baad4331ea55f428c170b0 breaks libvirt with
"-append only allowed with -kernel option" when using images without an
explicit boot kernel set because the -kernel option (kernel_id in nova)
isn't supplied for those image types.
This patch reads the os_command_line property from the image metadata
only when using images with an explicit boot kernel set and ignores it
otherwise.
Reviewed: https:/ /review. openstack. org/87329 /git.openstack. org/cgit/ openstack/ nova/commit/ ?id=c6a6003a99c 27c920ead194d5d f6051800e8a9b4
Committed: https:/
Submitter: Jenkins
Branch: master
commit c6a6003a99c27c9 20ead194d5df605 1800e8a9b4
Author: Vladan Popovic <email address hidden>
Date: Mon Apr 14 13:04:13 2014 -0400
libvirt: Use os_command_line when kernel_id is set
Patch Iad53c687053bdb 5469baad4331ea5 5f428c170b0 breaks libvirt with
"-append only allowed with -kernel option" when using images without an
explicit boot kernel set because the -kernel option (kernel_id in nova)
isn't supplied for those image types.
This patch reads the os_command_line property from the image metadata
only when using images with an explicit boot kernel set and ignores it
otherwise.
Closes-bug: 1300861
Change-Id: I06c2d9930e0f36 a0d7057b6a0f5c9 c591caac43f