From 3f4010d35ad7086d37fad04e224d781c77ef7453 Mon Sep 17 00:00:00 2001
From: Will Szumski <will@stackhpc.com>
Date: Tue, 18 Apr 2023 14:27:32 +0100
Subject: [PATCH] Revert back to MichaelRigart.interfaces

NetworkManager support has now landed in upstream, see:

https://github.com/michaelrigart/ansible-role-interfaces/releases/tag/v1.14.0

This also fixes a couple of bugs in the fork we were using (see linked
bug reports).

Closes-Bug: #2016970
Closes-Bug: #2016971

Change-Id: I23584fe76554680251307d75078dec34e3a9d384
---
 ...ocky9-network-configuration-issues-69a47b921dc40581.yaml | 6 ++++++
 requirements.yml                                            | 6 ++----
 2 files changed, 8 insertions(+), 4 deletions(-)
 create mode 100644 releasenotes/notes/fixes-rocky9-network-configuration-issues-69a47b921dc40581.yaml

diff --git a/releasenotes/notes/fixes-rocky9-network-configuration-issues-69a47b921dc40581.yaml b/releasenotes/notes/fixes-rocky9-network-configuration-issues-69a47b921dc40581.yaml
new file mode 100644
index 00000000..88014679
--- /dev/null
+++ b/releasenotes/notes/fixes-rocky9-network-configuration-issues-69a47b921dc40581.yaml
@@ -0,0 +1,6 @@
+---
+fixes:
+  - |
+    Fixes various issues when applying network configuration on Rocky 9 hosts.
+    See bugs: `2016970 <https://bugs.launchpad.net/kayobe/+bug/2016970>`_ and
+    `2016971 <https://bugs.launchpad.net/kayobe/+bug/2016971>`_.
diff --git a/requirements.yml b/requirements.yml
index cb78d86e..1ab9b656 100644
--- a/requirements.yml
+++ b/requirements.yml
@@ -16,10 +16,8 @@ roles:
   - src: jriguera.configdrive
     # There are no versioned releases of this role.
     version: 29871bf3279ef95fc8f7339b9abd13f869980750
-  - src: https://github.com/stackhpc/ansible-role-interfaces.git
-    name: MichaelRigart.interfaces
-    scm: git
-    version: networkmanager
+  - name: MichaelRigart.interfaces
+    version: v1.14.0
   - src: mrlesmithjr.chrony
     version: v0.1.4
   - src: mrlesmithjr.manage-lvm
-- 
GitLab