lp:~smoser/maas-images/trunk.dyn-netconf-krd-only
- Get this branch:
- bzr branch lp:~smoser/maas-images/trunk.dyn-netconf-krd-only
Branch merges
- maintainers of maas images: Pending requested
-
Diff: 87 lines (+19/-37)2 files modifiedbin/kpack-from-image (+11/-35)
bin/maas-cloudimg2ephemeral (+8/-2)
Related bugs
Bug #1749019: maas do not bring up networking with BOOTIF in ip= | Critical | Fix Released |
Related blueprints
Branch information
Recent revisions
- 393. By Scott Moser
-
Add cloud-initramfs
-dyn-netconf in initramfs generation. The package cloud-initramfs
-dyn-netconf is not needed inside the image.
For releases less than bionic, leave it there. In those releases it
was either always installed (xenial) or installed via the ubuntu-server
meta-package.For bionic, it is not needed in the image, and was removed from the
ubuntu-server seed and meta-package.Thus, for bionic, we have to add it in the initramfs generation.
The mechanism for doing so that is added ensures it is added if not
present.This change is actually not meaningful if the squashfs image is
the one used in publication (maas v3 streams). But is meaningful
for v2 streams, where the maas-image build process produces
the root-image.gz. - 392. By Scott Moser
-
Re-add cloud-initramfs
-dyn-netconf. Needed by maas for BOOTIF in ip=. The previous commit to trunk dropped cloud-initramfs
-dyn-netconf from
the maas image in releases newer than xenial.That caused errors in MAAS. cloud-initramfs
-dyn-netconf does 2 things:
a.) writes /run/network/dynamic- interfaces
this is a ENI style file with data retrived from ipconfig
b.) convert 'BOOTIF' string in the value of IP
Example:
ip=::::foobar: BOOTIF BOOTIF= 01-00-22- 68-10-c1- e6
will be effectively rendered as:
ip=::::foobar: eth0 'b' is still required by maas.
Note: in maas v3 images, the squashfs image is re-used pristine
from cloud-images. Because of this, the installation into the image
affects initramfs creation, but does not affect the image. That is
correct in that this package is not needed in the image but only
in the initramfs. - 391. By Scott Moser
-
Do not install cloud-initramfs
-dyn-netconf in releases newer than xenial. The cloud-initramfs
-dyn-netconf was being added to the maas image.
It was only absolutely necessary in <xenial, but is left as present
in xenial as images still use the /etc/network/interfaces link.
See change="symlink ENI for cloud-initramfs-dyn-netconf" . It is not needed in or used without ifupdown, and ifupdown is not present
in artful or bionic. - 390. By Scott Moser
-
Always create squashfs image if configured.
For precise in the v3 stream there was no 'squashfs' image created.
This was enabled only if input to the build was '.tar.gz' or 'squashfs'.As we need a squashfs image for installing precise with maas 2.3+,
we modify the code here to build that image.Note that this squashfs image is known to not boot with rooturl
as the other squashfs images produced do. - 389. By Scott Moser
-
precise: remove reference to non-existing package linux-signed-
generic. Apparently there was no signed generic kernel for precise GA.
Specifically, there is no:
linux-signed- generic
but there *is*:
linux-signed- generic- lts-quantal
linux-signed- generic- lts-raring
linux-signed- generic- lts-saucy
linux-signed- generic- lts-trusty - 388. By Scott Moser
-
Cleanups around use of --proposed.
The --proposed flag was not getting all the way through to
kpack-from-image. This modification just gets it set all the way through.
It isn't strictly needed, because the image that it runs in will have
proposed enabled already, but passing it through makes it more obvious.In kpack-from-image, use the same .list file name that is used in
maas-cloudimg2eph and also enable universe and multiverse as are done there.Also some cleanups:
- dist_upgrade was set to 'false' by default, but then enabled to either
'true' or '1'. Just be consistent and set to true to avoid confusion.
- fix a debug message that reported about ppa when it should have reported
about proposed. - 387. By Scott Moser
-
Stop grub scripts from running when updating an image.
An upgrade that brought a new kernel would cause grub's kernel
hook scripts to run. Those would fail to run and cause build failure
(at least in trusty). This is similar to code that is currently
in the kpack-from-image, but handles putting things back more elegantly.
(kpack-from-image doesn't have to put things back).I found this when running with '--proposed' and trusty.
- 386. By Scott Moser
-
Add zfs module and dependencies to generated initramfs.
In order for curtin to use zfs, it has to have access to the modules.
Add 'zfs' and its dependencies to the initramfs.Note that the user-space tools (zfsutils-linux) are not currently
a dependency of ubuntu-server and are thus not in the squashfs images.
That means that for curtin to use zfs it has to install the package.
The package handles loading zfs module.
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)
- Stacked on:
- lp:maas-images