From 2af9c11f08f3437284ca9f1bdca7c86dd79176cb Mon Sep 17 00:00:00 2001
From: Alex Schultz <aschultz@redhat.com>
Date: Fri, 27 Jul 2018 08:57:34 -0600
Subject: [PATCH] Revert "Revert "Add disable-nouveau element to tripleo
 images""

This reverts commit 28384614a52b0b75fc2fcd40103ec6cfd3d86a69.

This should land after we have a promoted DIB.

Change-Id: I1ae04d297bdd81f2ecfef8e2dc5a650cae9616ad
Related-Bug: #1784015
---
 image-yaml/overcloud-hardened-images-uefi.yaml           | 3 ++-
 image-yaml/overcloud-hardened-images.yaml                | 3 ++-
 image-yaml/overcloud-images.yaml                         | 1 +
 image-yaml/overcloud-realtime-compute.yaml               | 1 +
 releasenotes/notes/disable_nouveau-bbaf1263fe43821a.yaml | 6 ++++++
 5 files changed, 12 insertions(+), 2 deletions(-)
 create mode 100644 releasenotes/notes/disable_nouveau-bbaf1263fe43821a.yaml

diff --git a/image-yaml/overcloud-hardened-images-uefi.yaml b/image-yaml/overcloud-hardened-images-uefi.yaml
index f50dd4fc2..977892a5d 100644
--- a/image-yaml/overcloud-hardened-images-uefi.yaml
+++ b/image-yaml/overcloud-hardened-images-uefi.yaml
@@ -21,9 +21,10 @@ disk_images:
       - dracut-regenerate
       - remove-machine-id
       - remove-resolvconf
-      - modprobe-blacklist
+      - modprobe
       - overcloud-secure-uefi
       - openssh
+      - disable-nouveau
     packages:
       - ntp
       - python-psutil
diff --git a/image-yaml/overcloud-hardened-images.yaml b/image-yaml/overcloud-hardened-images.yaml
index e22b40c2e..3432b3c6b 100644
--- a/image-yaml/overcloud-hardened-images.yaml
+++ b/image-yaml/overcloud-hardened-images.yaml
@@ -21,9 +21,10 @@ disk_images:
       - dracut-regenerate
       - remove-machine-id
       - remove-resolvconf
-      - modprobe-blacklist
+      - modprobe
       - overcloud-secure
       - openssh
+      - disable-nouveau
     packages:
       - ntp
       - python-psutil
diff --git a/image-yaml/overcloud-images.yaml b/image-yaml/overcloud-images.yaml
index 9484240bb..6b9974789 100644
--- a/image-yaml/overcloud-images.yaml
+++ b/image-yaml/overcloud-images.yaml
@@ -23,6 +23,7 @@ disk_images:
       - remove-machine-id
       - remove-resolvconf
       - openssh
+      - disable-nouveau
     packages:
       - python-psutil
       - python-debtcollector
diff --git a/image-yaml/overcloud-realtime-compute.yaml b/image-yaml/overcloud-realtime-compute.yaml
index 6133a33ca..1a9539eaf 100644
--- a/image-yaml/overcloud-realtime-compute.yaml
+++ b/image-yaml/overcloud-realtime-compute.yaml
@@ -21,6 +21,7 @@ disk_images:
       - remove-resolvconf
       - realtime-kernel
       - openssh
+      - disable-nouveau
     packages:
       - python-psutil
       - python-debtcollector
diff --git a/releasenotes/notes/disable_nouveau-bbaf1263fe43821a.yaml b/releasenotes/notes/disable_nouveau-bbaf1263fe43821a.yaml
new file mode 100644
index 000000000..b93689d3a
--- /dev/null
+++ b/releasenotes/notes/disable_nouveau-bbaf1263fe43821a.yaml
@@ -0,0 +1,6 @@
+---
+features:
+  - |
+    Add disable-nouveau element to tripleo images
+    This ensures nouveau is not loaded at boot, as this can prevent PCI passthrough
+    or loading the NVIDIA binary drivers that are required for vGPU support.