From: Jenkins <jenkins@review.openstack.org>
Date: Thu, 6 Apr 2017 12:44:21 +0000 (+0000)
Subject: Merge "Don't disable satellite repo after registration"
X-Git-Tag: opnfv-6.0.0~815
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=161b2b4427f7db0cf65d209a3f63804de9724107;p=apex-tripleo-heat-templates.git

Merge "Don't disable satellite repo after registration"
---

161b2b4427f7db0cf65d209a3f63804de9724107
diff --cc extraconfig/pre_deploy/rhel-registration/scripts/rhel-registration
index 0d0fa3f1,4f13a795..d14ed73f
--- a/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