From f9889ee3e88c3188292da073a4fd964eb8ae491c Mon Sep 17 00:00:00 2001
From: Joseph Pisciotta <jpisciot@jpisciot-mac.local>
Date: Tue, 6 Mar 2018 10:41:33 -0500
Subject: [PATCH] Made suggested revisions

---
 bootstrap.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/bootstrap.py b/bootstrap.py
index 6668c53..22dd33c 100755
--- a/bootstrap.py
+++ b/bootstrap.py
@@ -1164,8 +1164,6 @@ def exec_service(service, command, failonerror=True):
             create_host()
         configure_subscription_manager()
         migrate_systems(options.org, options.activationkey)
-        if 'foreman' not in options.skip:
-            delete_file('/etc/rhsm/facts/location.facts')
         if options.enablerepos:
             enable_repos()
     elif options.new_capsule:
@@ -1261,6 +1259,9 @@ def exec_service(service, command, failonerror=True):
         if options.enablerepos:
             enable_repos()
 
+    if options.location and 'foreman' in options.skip: 
+        delete_file('/etc/rhsm/facts/location.facts')
+
     if not options.remove and not options.new_capsule:
         # > IF not removing, install Katello agent, optionally update host,
         # >                  optionally clean and install Puppet agent