From 16a00db1f028afd10ffc2016819ca0a6d0fcdb30 Mon Sep 17 00:00:00 2001
From: "Brian C. Lane" <bcl@redhat.com>
Date: Mon, 17 Jun 2019 11:24:27 -0700
Subject: [PATCH] Enable networking in lorax-composer templates

Because anaconda --dirinstall is used the kickstart's network like isn't
processed at all. So we need to remove the NetworkManager-server-config
package which disables networking.

Resolves: rhbz#1710877
---
 share/composer/ami.ks              | 2 ++
 share/composer/ext4-filesystem.ks  | 2 ++
 share/composer/live-iso.ks         | 2 ++
 share/composer/openstack.ks        | 2 ++
 share/composer/partitioned-disk.ks | 2 ++
 share/composer/qcow2.ks            | 2 ++
 share/composer/tar.ks              | 2 ++
 share/composer/vhd.ks              | 2 ++
 share/composer/vmdk.ks             | 2 ++
 9 files changed, 18 insertions(+)

diff --git a/share/composer/ami.ks b/share/composer/ami.ks
index 724567ac..1b3755de 100644
--- a/share/composer/ami.ks
+++ b/share/composer/ami.ks
@@ -44,6 +44,8 @@ sed -i 's/cloud-user/ec2-user/' /etc/cloud/cloud.cfg
 %packages
 kernel
 -dracut-config-rescue
+# Enable networking by removing the config file that disables it
+-NetworkManager-config-server
 
 grub2
 
diff --git a/share/composer/ext4-filesystem.ks b/share/composer/ext4-filesystem.ks
index 74a5d95a..118f3623 100644
--- a/share/composer/ext4-filesystem.ks
+++ b/share/composer/ext4-filesystem.ks
@@ -33,5 +33,7 @@ touch /etc/machine-id
 %packages --nobase
 # Packages requires to support this output format go here
 selinux-policy-targeted
+# Enable networking by removing the config file that disables it
+-NetworkManager-config-server
 
 # NOTE lorax-composer will add the blueprint packages below here, including the final %end
diff --git a/share/composer/live-iso.ks b/share/composer/live-iso.ks
index 3890d8c8..69e97a71 100644
--- a/share/composer/live-iso.ks
+++ b/share/composer/live-iso.ks
@@ -348,6 +348,8 @@ memtest86+
 syslinux
 -dracut-config-rescue
 selinux-policy-targeted
+# Enable networking by removing the config file that disables it
+-NetworkManager-config-server
 
 # This package is needed to boot the iso on UEFI
 shim
diff --git a/share/composer/openstack.ks b/share/composer/openstack.ks
index 7db64163..83eb273a 100644
--- a/share/composer/openstack.ks
+++ b/share/composer/openstack.ks
@@ -37,6 +37,8 @@ touch /etc/machine-id
 kernel
 -dracut-config-rescue
 grub2
+# Enable networking by removing the config file that disables it
+-NetworkManager-config-server
 
 # Make sure virt guest agents are installed
 qemu-guest-agent
diff --git a/share/composer/partitioned-disk.ks b/share/composer/partitioned-disk.ks
index 6008d313..456a7a7b 100644
--- a/share/composer/partitioned-disk.ks
+++ b/share/composer/partitioned-disk.ks
@@ -37,5 +37,7 @@ kernel
 -dracut-config-rescue
 selinux-policy-targeted
 grub2
+# Enable networking by removing the config file that disables it
+-NetworkManager-config-server
 
 # NOTE lorax-composer will add the blueprint packages below here, including the final %end
diff --git a/share/composer/qcow2.ks b/share/composer/qcow2.ks
index 3f569149..d69ef235 100644
--- a/share/composer/qcow2.ks
+++ b/share/composer/qcow2.ks
@@ -37,6 +37,8 @@ kernel
 -dracut-config-rescue
 selinux-policy-targeted
 grub2
+# Enable networking by removing the config file that disables it
+-NetworkManager-config-server
 
 # Make sure virt guest agents are installed
 qemu-guest-agent
diff --git a/share/composer/tar.ks b/share/composer/tar.ks
index 2fcf5901..7f7e8b1c 100644
--- a/share/composer/tar.ks
+++ b/share/composer/tar.ks
@@ -34,5 +34,7 @@ touch /etc/machine-id
 %packages
 # Packages requires to support this output format go here
 selinux-policy-targeted
+# Enable networking by removing the config file that disables it
+-NetworkManager-config-server
 
 # NOTE lorax-composer will add the blueprint packages below here, including the final %end
diff --git a/share/composer/vhd.ks b/share/composer/vhd.ks
index 57a0b347..c02a0f74 100644
--- a/share/composer/vhd.ks
+++ b/share/composer/vhd.ks
@@ -61,6 +61,8 @@ dracut -f -v --persistent-policy by-uuid
 %packages
 kernel
 -dracut-config-rescue
+# Enable networking by removing the config file that disables it
+-NetworkManager-config-server
 
 grub2
 
diff --git a/share/composer/vmdk.ks b/share/composer/vmdk.ks
index b6f8ddac..8da5ff85 100644
--- a/share/composer/vmdk.ks
+++ b/share/composer/vmdk.ks
@@ -36,6 +36,8 @@ touch /etc/machine-id
 %packages
 kernel
 -dracut-config-rescue
+# Enable networking by removing the config file that disables it
+-NetworkManager-config-server
 
 grub2