From 9b51eb711109ad553d0ee427cab26f61c91fd2f5 Mon Sep 17 00:00:00 2001
From: Stephen Benjamin <stephen@redhat.com>
Date: Wed, 18 Dec 2019 10:54:02 -0500
Subject: [PATCH] Remove patch for ironic-machine-os-downloader rename

After the installer PR merges, we must remove this patch.
---
 ocp_install_env.sh | 2 +-
 run_ci.sh          | 3 ---
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/ocp_install_env.sh b/ocp_install_env.sh
index 735957bf4..e21493dad 100644
--- a/ocp_install_env.sh
+++ b/ocp_install_env.sh
@@ -50,7 +50,7 @@ function extract_installer() {
 function clone_installer() {
   # Clone repo, if not already present
   if [[ ! -d $OPENSHIFT_INSTALL_PATH ]]; then
-    sync_repo_and_patch go/src/github.com/openshift/installer https://github.com/openshift/installer.git https://patch-diff.githubusercontent.com/raw/openshift/installer/pull/2821.patch
+    sync_repo_and_patch go/src/github.com/openshift/installer https://github.com/openshift/installer.git
   fi
 }
 
diff --git a/run_ci.sh b/run_ci.sh
index 4d22967ac..15b12856c 100755
--- a/run_ci.sh
+++ b/run_ci.sh
@@ -1,9 +1,6 @@
 #!/bin/bash
 set -ex
 
-# temporary
-export KNI_INSTALL_FROM_GIT=true
-
 # grabs files and puts them into $LOGDIR to be saved as jenkins artifacts
 function getlogs(){
     LOGDIR=/home/notstack/dev-scripts/logs