openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Merge "Fix satellite registration for http or https" into stable/liberty

This commit is contained in:
Jenkins 2016-03-25 10:54:30 +00:00 committed by Gerrit Code Review
parent aadd3e4e7a 64ce3e63cf
commit 37cc120cc1
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
extraconfig/pre_deploy/rhel-registration/scripts/rhel-registration
View File

@ -98,10 +98,10 @@ fi
function detect_satellite_version {
ping_api=$REG_SAT_URL/katello/api/ping
if curl -k -s -D - -o /dev/null $ping_api | grep "200 OK"; then
if curl -L -k -s -D - -o /dev/null $ping_api | grep "200 OK"; then
echo Satellite 6 detected at $REG_SAT_URL
satellite_version=6
elif curl -k -s -D - -o /dev/null $REG_SAT_URL/rhn/Login.do | grep "200 OK"; then
elif curl -L -k -s -D - -o /dev/null $REG_SAT_URL/rhn/Login.do | grep "200 OK"; then
echo Satellite 5 detected at $REG_SAT_URL
satellite_version=5
else
@ -120,9 +120,10 @@ case "${REG_METHOD:-}" in
;;
satellite)
detect_satellite_version
if [ "satellite_version" = "6" ]; then
if [ "$satellite_version" = "6" ]; then
repos="$repos --enable ${satellite_repo}"
rpm -Uvh "$REG_SAT_URL/pub/katello-ca-consumer-latest.noarch.rpm" || true
curl -L -k -O "$REG_SAT_URL/pub/katello-ca-consumer-latest.noarch.rpm"
rpm -Uvh katello-ca-consumer-latest.noarch.rpm || true
subscription-manager register $opts
subscription-manager $repos
yum install -y katello-agent || true # needed for errata reporting to satellite6