From 28384614a52b0b75fc2fcd40103ec6cfd3d86a69 Mon Sep 17 00:00:00 2001
From: Alex Schultz <aschultz@redhat.com>
Date: Fri, 27 Jul 2018 14:56:14 +0000
Subject: [PATCH] Revert "Add disable-nouveau element to tripleo images"

This reverts commit 7c396455739209e102ea2409e557373f9c5afd9c.

Without a promoted DIB package, this causes OVB jobs to fail.

Change-Id: I8bacdf2811bfbe95010360cf4e99879ae1f313b2
Closes-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, 2 insertions(+), 12 deletions(-)
 delete 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 977892a5d..f50dd4fc2 100644
--- a/image-yaml/overcloud-hardened-images-uefi.yaml
+++ b/image-yaml/overcloud-hardened-images-uefi.yaml
@@ -21,10 +21,9 @@ disk_images:
       - dracut-regenerate
       - remove-machine-id
       - remove-resolvconf
-      - modprobe
+      - modprobe-blacklist
       - 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 3432b3c6b..e22b40c2e 100644
--- a/image-yaml/overcloud-hardened-images.yaml
+++ b/image-yaml/overcloud-hardened-images.yaml
@@ -21,10 +21,9 @@ disk_images:
       - dracut-regenerate
       - remove-machine-id
       - remove-resolvconf
-      - modprobe
+      - modprobe-blacklist
       - overcloud-secure
       - openssh
-      - disable-nouveau
     packages:
       - ntp
       - python-psutil
diff --git a/image-yaml/overcloud-images.yaml b/image-yaml/overcloud-images.yaml
index 6b9974789..9484240bb 100644
--- a/image-yaml/overcloud-images.yaml
+++ b/image-yaml/overcloud-images.yaml
@@ -23,7 +23,6 @@ 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 1a9539eaf..6133a33ca 100644
--- a/image-yaml/overcloud-realtime-compute.yaml
+++ b/image-yaml/overcloud-realtime-compute.yaml
@@ -21,7 +21,6 @@ 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
deleted file mode 100644
index b93689d3a..000000000
--- a/releasenotes/notes/disable_nouveau-bbaf1263fe43821a.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
----
-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.