Merge "Allow custom undercloud initrd/vmlinuz"

This commit is contained in:
Jenkins 2017-04-25 13:35:28 +00:00 committed by Gerrit Code Review
commit 1b22181187
4 changed files with 15 additions and 3 deletions

View File

@ -77,3 +77,11 @@ Please note that you also need to define all the images you want to
fetch, using the ``images`` setting. You will need to define the name
of the image, the url where to get it, and the image type (qcow2, tar).
As a reference, please look at the `config <http://git.openstack.org/cgit/openstack/tripleo-quickstart/tree/config/release/master-tripleo-ci.yml>`_
Consuming external/custom vmlinuz and initrd for undercloud
-----------------------------------------------------------
By default, the kernel executable and initial rootfs for an undercloud VM
are extracted from the overcloud image. In order to switch to custom
``undercloud_custom_initrd`` and ``undercloud_custom_vmlinuz`` images,
set the ``undercloud_use_custom_boot_images`` to True.

View File

@ -1,3 +1,6 @@
# variable only used during gating (when compressed_gating_repo is defined)
gating_repo_enabled: true
undercloud_use_custom_boot_images: false
undercloud_custom_vmlinuz: "{{ working_dir }}/overcloud-full.vmlinuz"
undercloud_custom_initrd: "{{ working_dir }}/overcloud-full.initrd"

View File

@ -234,6 +234,7 @@
'{{ working_dir }}'
environment:
LIBVIRT_DEFAULT_URI: "{{ libvirt_uri }}"
when: not undercloud_use_custom_boot_images|bool
# NOTE(trown): This is a bit of a hack to get the undercloud vm
# template to use the external kernel and initrd. We should

View File

@ -6,9 +6,9 @@
<type arch='{{ libvirt_arch }}'>hvm</type>
<boot dev='hd'/>
<bootmenu enable='no'/>
{% if overcloud_as_undercloud|bool %}
<kernel>{{ working_dir }}/overcloud-full.vmlinuz</kernel>
<initrd>{{ working_dir }}/overcloud-full.initrd</initrd>
{% if overcloud_as_undercloud|bool or undercloud_use_custom_boot_images|bool %}
<kernel>{{ undercloud_custom_vmlinuz }}</kernel>
<initrd>{{ undercloud_custom_initrd }}</initrd>
<cmdline>console=ttyS0 root=/dev/vda</cmdline>
{% endif %}
</os>