From 85a4ec2b2db63a81cf97090a507f9817e5eea07d Mon Sep 17 00:00:00 2001
From: Ian Wienand <iwienand@redhat.com>
Date: Wed, 2 Oct 2019 07:18:34 +0000
Subject: [PATCH] Add NetworkManager and dhcp-client for CentOS 8
As described inline, NetworkManager and dhcp-client make up the basic
networking for centos 8 installs; bring them into the base image.
Although in infra we then use simple-init, some other users find this
helpful.
Change-Id: Ib9f32e73bf9109cc1b659fe1deceb1a15301ffeb
---
.../elements/yum-minimal/package-installs.yaml | 7 +++++++
diskimage_builder/elements/yum-minimal/pkg-map | 10 +++++++++-
2 files changed, 16 insertions(+), 1 deletion(-)
diff --git a/diskimage_builder/elements/yum-minimal/package-installs.yaml b/diskimage_builder/elements/yum-minimal/package-installs.yaml
index 2596fd404..1b66417cb 100644
--- a/diskimage_builder/elements/yum-minimal/package-installs.yaml
+++ b/diskimage_builder/elements/yum-minimal/package-installs.yaml
@@ -11,3 +11,10 @@ linux-firmware:
uninstall: true
linux-firmware-whence:
uninstall: true
+# NOTE(ianw) pkg-map restricts this to !rhel/centos 7; in 7
+# the "initscripts" package handles basic networking, in
+# 8+ it's the role of NetworkManager and dhcp-client. This
+# mirrors the default packages installed in upstream cloud images
+# to facilitate a basic network.
+NetworkManager:
+dhcp-client:
\ No newline at end of file
diff --git a/diskimage_builder/elements/yum-minimal/pkg-map b/diskimage_builder/elements/yum-minimal/pkg-map
index 3559c5d59..c30443608 100644
--- a/diskimage_builder/elements/yum-minimal/pkg-map
+++ b/diskimage_builder/elements/yum-minimal/pkg-map
@@ -1,5 +1,13 @@
{
- "family": {
+ "release": {
+ "centos": {
+ "7": {
+ "NetworkManager": "",
+ "dhcp-client": ""
+ }
+ }
+ },
+"family": {
"redhat": {
"lsb_release": "redhat-lsb-core"
}