From 6f921506ab76f649600bc81b962d490bb15fc291 Mon Sep 17 00:00:00 2001
From: Yussuf Shaikh <yussuf.shaikh@ibm.com>
Date: Wed, 24 Feb 2021 20:21:46 +0530
Subject: [PATCH] Fix Ansible install on CentOS (#175)

* Fix ansible install on CentOS

Fixes #174

Signed-off-by: Yussuf Shaikh <yussuf.shaikh@ibm.com>

* Remove stale repo fix

Signed-off-by: Yussuf Shaikh <yussuf.shaikh@ibm.com>
---
 modules/1_bastion/bastion.tf | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/modules/1_bastion/bastion.tf b/modules/1_bastion/bastion.tf
index 221d55e38..a4ddb68a8 100644
--- a/modules/1_bastion/bastion.tf
+++ b/modules/1_bastion/bastion.tf
@@ -174,9 +174,6 @@ resource "null_resource" "bastion_register" {
     provisioner "remote-exec" {
         inline = [<<EOF
 
-# FIX for existing stale repos
-echo 'Moving all file from /etc/yum.repos.d/ to /etc/yum.repos.d.bak/'
-mkdir /etc/yum.repos.d.bak/ && mv /etc/yum.repos.d/* /etc/yum.repos.d.bak/
 # Give some more time to subscription-manager
 sudo subscription-manager config --server.server_timeout=600
 sudo subscription-manager clean
@@ -219,7 +216,6 @@ EOF
 }
 
 resource "null_resource" "enable_repos" {
-    count       = ( var.rhel_subscription_username == "" || var.rhel_subscription_username  == "<subscription-id>" ) && var.rhel_subscription_org == "" ? 0 : 1
     depends_on      = [null_resource.bastion_init, null_resource.setup_proxy_info, null_resource.bastion_register]
 
     connection {