Merge "Don't disable satellite repo after registration"

diff --cc extraconfig/pre_deploy/rhel-registration/scripts/rhel-registration
index 0d0fa3f,4f13a79..d14ed73
--- 1/extraconfig/pre_deploy/rhel-registration/scripts/rhel-registration
--- 2/extraconfig/pre_deploy/rhel-registration/scripts/rhel-registration
+++ b/extraconfig/pre_deploy/rhel-registration/scripts/rhel-registration
@@@ -240,10 -226,9 +240,9 @@@ case "${REG_METHOD:-}" i
              retry subscription-manager $repos
              retry yum install -y katello-agent || true # needed for errata reporting to satellite6
              katello-package-upload
-             retry subscription-manager repos --disable ${satellite_repo}
          else
              pushd /usr/share/rhn/
 -            curl --retry 3 --retry-delay 10 --max-time 30 -k -O $REG_SAT_URL/pub/RHN-ORG-TRUSTED-SSL-CERT
 +            curl --retry ${retry_max_count} --retry-delay 10 --max-time 30 -k -O $REG_SAT_URL/pub/RHN-ORG-TRUSTED-SSL-CERT
              popd
              retry rhnreg_ks --serverUrl=$REG_SAT_URL/XMLRPC $sat5_opts
          fi