From 1ebd7afac1c49b9fe413a286c21c311bb0a31072 Mon Sep 17 00:00:00 2001
From: Alex Schultz <aschultz@redhat.com>
Date: Mon, 26 Aug 2019 08:49:44 -0600
Subject: [PATCH] Clear net.ifnames definition

With RHEL8, net.ifnames is set to 0 in the grub config. This is a change
in the default image which can have user impacts. We want to clear it to
go back to the previously defined behavior in RHEL7.

Change-Id: I621066ea5e0e934668ff4c91e991a95d18e019f7
Closes-Bug: #1841441
(cherry picked from commit 8da8d9a51b287d520c465fae254262fc4286e92e)
---
 elements/interface-names/README.md                     |  7 +++++++
 .../interface-names/install.d/70-clear-net-ifnames     | 10 ++++++++++
 elements/os-net-config/element-deps                    |  1 +
 3 files changed, 18 insertions(+)
 create mode 100644 elements/interface-names/README.md
 create mode 100755 elements/interface-names/install.d/70-clear-net-ifnames

diff --git a/elements/interface-names/README.md b/elements/interface-names/README.md
new file mode 100644
index 000000000..1d0b585a6
--- /dev/null
+++ b/elements/interface-names/README.md
@@ -0,0 +1,7 @@
+interface-names
+===============
+
+net.ifnames may be 0 in /etc/default/grub which can make generating a
+configuration for the network interfaces difficult. The default in RHEL7
+was to not have this defined. The kernel args can be tuned later in the
+deployment so we want to clean it out if it is defined in grub.
diff --git a/elements/interface-names/install.d/70-clear-net-ifnames b/elements/interface-names/install.d/70-clear-net-ifnames
new file mode 100755
index 000000000..d276decd1
--- /dev/null
+++ b/elements/interface-names/install.d/70-clear-net-ifnames
@@ -0,0 +1,10 @@
+#!/bin/bash
+
+set -eux
+set -o pipefail
+
+if [ -f /etc/default/grub ]; then
+    # net.ifacenames is defined and set to 0 starting with RHEL8.
+    # This is a change from RHEL7 which can affect network configurations.
+    sed -i 's/net.ifnames=0//g' /etc/default/grub
+fi
diff --git a/elements/os-net-config/element-deps b/elements/os-net-config/element-deps
index 8002f76a1..b4a5ec50d 100644
--- a/elements/os-net-config/element-deps
+++ b/elements/os-net-config/element-deps
@@ -3,3 +3,4 @@ os-refresh-config
 package-installs
 pip-manifest
 openvswitch
+interface-names