Go to file
Ian Wienand 2d47d4157c Fix BLS based bootloader installation
This reverts I2701260d54cf6bc79f1ac765b512d99d799e8c43,
Idf2a471453c5490d927979fb97aa916418172153 and part of
Iecf7f7e4c992bb23437b6461cdd04cdca96aafa6 which added special flags to
update kernels via grubby.

These changes actually ended up reverting the behaviour on Fedora 35,
which is what led me to investigate what was going on more fully.

All distros still support setting GRUB_DEVICE in /etc/default/grub;
even the BLS based ones (i.e. everything !centos7).

The implementation *is* confusing -- in earlier distros each BLS entry
would refer to the variable $kernelopts; which grub2-mkconfig would
write into /boot/grub2/grubenv.  After commit [1] this was reverted,
and the kernel options are directly written into the BLS entry.

But the real problem is this bit from [2]

 get_sorted_bls()
 {
     if ! [ -d "${blsdir}" ] || ! [ -e /etc/machine-id ]; then
        return
     fi
     ...
     files=($(for bls in ${blsdir}/${machine_id}-*.conf; do
     ...
 }

i.e., to avoid overwriting BLS entries for other OS-boots (?),
grub2-mkconfig will only update those BLS entries that match the
current machine-id.

The problem for DIB is that we are clearing the machine-id early in
finalise.d/01-clear-machine-id, but then running the bootloader update
later in finalise.d/50-bootloader.

The result is that the bootloader entry generated when we installed
the kernel (which guessed at the root= device, etc.) is *not* updated.
Even more annoyingly, the gate doesn't pick this up -- because the
gate tests run on a DIB image that was booted with
"root=LABEL=cloudimg-rootfs" the kernel initially installed with
"install-kernel" (that we never updated) is actually correct.  But
this fails when built on a production host.

Thus we don't need any of the explicit grubby updates; these are
reverted here.  This moves the machine-id clearing to after the
bootloader setup, which allows grub2-mkconfig to setup the BLS entries
correctly.

[1] 4a742183a3
[2] https://src.fedoraproject.org/rpms/grub2/blob/rawhide/f/0062-Add-BLS-support-to-grub-mkconfig.patch

Depends-On: https://review.opendev.org/c/zuul/nodepool/+/818705
Change-Id: Ia0e49980eb50eae29a5377d24ef0b31e4d78d346
2021-11-25 14:26:23 +11:00
.zuul.d Merge "Revert "centos 9-stream: make non-voting for mirror issues"" 2021-11-18 07:11:01 +00:00
bin dib-lint: match text/x-script.python 2021-05-10 14:29:51 +10:00
contrib Add support for CentOS Stream 9 in DIB 2021-10-27 13:38:14 +02:00
diskimage_builder Fix BLS based bootloader installation 2021-11-25 14:26:23 +11:00
doc Introduce openEuler distro 2021-08-04 03:06:55 +00:00
playbooks tests: remove debootstrap install 2021-10-27 11:01:55 +11:00
releasenotes containerfile: fix tar extraction 2021-11-10 11:42:49 +11:00
roles Add support for CentOS Stream 9 in DIB 2021-10-27 13:38:14 +02:00
tests Add support for CentOS Stream 9 in DIB 2021-10-27 13:38:14 +02:00
.gitignore Migrate from testr to stestr 2021-06-30 18:58:35 +05:30
.gitreview OpenDev Migration Patch 2019-04-19 19:26:30 +00:00
.stestr.conf Migrate from testr to stestr 2021-06-30 18:58:35 +05:30
bindep.txt yum-minimal: use DNF tools on host 2021-08-30 14:14:32 +10:00
LICENSE Fix copyrights for HP work. 2012-11-15 16:20:32 +13:00
lower-constraints.txt Drop lower version requirement for networkx 2021-10-05 12:55:43 +05:30
pylint.cfg Refactor: use lazy logging 2017-05-30 14:39:58 +10:00
README.rst Update readme to clarify an ubuntu bionic image is built 2020-06-07 19:53:46 +02:00
requirements.txt Drop lower version requirement for networkx 2021-10-05 12:55:43 +05:30
setup.cfg Remove py35 tox jobs 2021-10-20 09:38:47 +11:00
setup.py Cleanup py27 and docs support 2020-06-05 12:04:30 +02:00
test-requirements.txt Migrate from testr to stestr 2021-06-30 18:58:35 +05:30
tox.ini Migrate from testr to stestr 2021-06-30 18:58:35 +05:30

Image building tools for OpenStack
==================================

``diskimage-builder`` is a flexible suite of components for building a
wide-range of disk images, filesystem images and ramdisk images for
use with OpenStack.

This repository has the core functionality for building such images,
both virtual and bare metal. Images are composed using `elements`;
while fundamental elements are provided here, individual projects have
the flexibility to customise the image build with their own elements.

For example::

  $ DIB_RELEASE=bionic disk-image-create -o ubuntu-bionic.qcow2 vm ubuntu

will create a bootable Ubuntu Bionic based ``qcow2`` image.

``diskimage-builder`` is useful to anyone looking to produce
customised images for deployment into clouds. These tools are the
components of `TripleO <https://wiki.openstack.org/wiki/TripleO>`__
that are responsible for building disk images. They are also used
extensively to build images for testing OpenStack itself, particularly
with `nodepool
<https://docs.openstack.org/infra/system-config/nodepool.html>`__.
Platforms supported include Ubuntu, CentOS, RHEL and Fedora.

Full documentation, the source of which is in ``doc/source/``, is
published at:

* https://docs.openstack.org/diskimage-builder/latest/

Copyright
=========

Copyright 2012 Hewlett-Packard Development Company, L.P.
Copyright (c) 2012 NTT DOCOMO, INC.

All Rights Reserved.

Licensed under the Apache License, Version 2.0 (the "License"); you may
not use this file except in compliance with the License. You may obtain
a copy of the License at

    http://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
License for the specific language governing permissions and limitations
under the License.