commit 528430d78159a3ec6a6f3d76237c944b8384ed7c
Author: Lee Yarwood <email address hidden>
Date: Thu Jun 30 10:22:28 2016 +0100
libvirt: Use the recreated disk.config.rescue during a rescue
I931421ea introduced a callback to _create_configdrive from
_create_domain during a rescue that recreates the config disk of an
instance with an additional .rescue suffix. However due to a latent bug
neither the original or this recreated config disk are mapped to the
instance during the resulting rescue.
To correct this disk.config.rescue is now added to the disk_mapping for
the instance if a config disk is required during a rescue.
Closes-bug: #1597669
Change-Id: I46cebd0612f50ff7373f677c4a002d444a877972
(cherry picked from commit 8795b206247fe2ca57f32c437d72c51492637649)
Reviewed: https:/ /review. openstack. org/379041 /git.openstack. org/cgit/ openstack/ nova/commit/ ?id=528430d7815 9a3ec6a6f3d7623 7c944b8384ed7c
Committed: https:/
Submitter: Jenkins
Branch: stable/newton
commit 528430d78159a3e c6a6f3d76237c94 4b8384ed7c
Author: Lee Yarwood <email address hidden>
Date: Thu Jun 30 10:22:28 2016 +0100
libvirt: Use the recreated disk.config.rescue during a rescue
I931421ea introduced a callback to _create_configdrive from
_create_domain during a rescue that recreates the config disk of an
instance with an additional .rescue suffix. However due to a latent bug
neither the original or this recreated config disk are mapped to the
instance during the resulting rescue.
To correct this disk.config.rescue is now added to the disk_mapping for
the instance if a config disk is required during a rescue.
Closes-bug: #1597669 f7373f677c4a002 d444a877972 a57f32c437d72c5 1492637649)
Change-Id: I46cebd0612f50f
(cherry picked from commit 8795b206247fe2c