From 1c792cf8c1ccd100943d777d87aa9dd34a05ee2d Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Mon, 16 May 2022 18:19:34 -0700 Subject: [PATCH] nbde: fix this with proper fixes My last commit wasn't correct. It turns out we still need to: a) drop the dracut made bogus "Wired Connection". We do this in nbde_client-network-flush by removing the default connection file. b) We also need to tell NetworkManager to not make 'Wired Connection 43' for any non configured interfaces. We only want to use the ones we configure and not any of the others that may or may not have link. Signed-off-by: Kevin Fenzi --- files/hotfix/nbde_client.conf | 3 --- playbooks/groups/virthost.yml | 16 ++++++++++++---- 2 files changed, 12 insertions(+), 7 deletions(-) delete mode 100644 files/hotfix/nbde_client.conf diff --git a/files/hotfix/nbde_client.conf b/files/hotfix/nbde_client.conf deleted file mode 100644 index 579fab6850..0000000000 --- a/files/hotfix/nbde_client.conf +++ /dev/null @@ -1,3 +0,0 @@ -# nbde_client dracut config -kernel_cmdline="ip=dhcp" -omit_dracutmodules+=" ifcfg " diff --git a/playbooks/groups/virthost.yml b/playbooks/groups/virthost.yml index caad509890..dccb91b502 100644 --- a/playbooks/groups/virthost.yml +++ b/playbooks/groups/virthost.yml @@ -18,13 +18,21 @@ - include_vars: dir=/srv/web/infra/ansible/vars/all/ ignore_files=README - import_tasks: "{{ tasks_path }}/yumrepos.yml" - - name: override nbde_client.conf to work around bug + - name: override nbde_client-network-flush to work around bug copy: - src: "{{ files }}/hotfix/nbde_client.conf" - dest: /etc/dracut.conf.d/nbde_client.conf + src: "{{ files }}/common/nbde_client-network-flush" + dest: /usr/bin/nbde_client-network-flush owner: root group: root - mode: 444 + mode: 755 + + - name: tell NetworkManager we don't want any auto connections + copy: + src: "{{ files }}/common/noautodefault.conf" + dest: /etc/NetworkManager/conf.d/noautodefault.conf + owner: root + group: root + mode: 644 roles: - base