openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Merge "Support for Satellite Capsule in rhel-registration" into stable/pike

This commit is contained in:
Zuul 2017-10-24 10:03:13 +00:00 committed by Gerrit Code Review
parent 09dbd6733c 598c7b6916
commit 684bb36895
2 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -186,14 +186,13 @@ function retry() {
set -e
}
function detect_satellite_version {
ping_api=$REG_SAT_URL/katello/api/ping
if curl --retry ${retry_max_count} --retry-delay 10 --max-time 30 -L -k -s -D - -o /dev/null $ping_api | grep "200 OK"; then
echo Satellite 6 detected at $REG_SAT_URL
satellite_version=6
function detect_satellite_server {
if curl --retry ${retry_max_count} --retry-delay 10 --max-time 30 -L -k -s -D - -o /dev/null $REG_SAT_URL/pub/katello-ca-consumer-latest.noarch.rpm | grep "200 OK"; then
echo Satellite 6 or beyond with Katello API detected at $REG_SAT_URL
katello_api_enabled=1
elif curl --retry ${retry_max_count} --retry-delay 10 --max-time 30 -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
echo Satellite 5 with RHN detected at $REG_SAT_URL
katello_api_enabled=0
else
echo No Satellite detected at $REG_SAT_URL
exit 1
@ -231,8 +230,8 @@ case "${REG_METHOD:-}" in
retry subscription-manager $repos
;;
satellite)
detect_satellite_version
if [ "$satellite_version" = "6" ]; then
detect_satellite_server
if [ "$katello_api_enabled" = "1" ]; then
repos="$repos --enable ${satellite_repo}"
curl --retry ${retry_max_count} --retry-delay 10 --max-time 30 -L -k -O "$REG_SAT_URL/pub/katello-ca-consumer-latest.noarch.rpm"

7
releasenotes/notes/sat_capsule-bb59fad44c17f97f.yaml Normal file
View File

@ -0,0 +1,7 @@
---
fixes:
- |
For deployments running on RHEL with Satellite 6 (or beyond) with Capsule (Katello API enabled),
the Katello API is available on 8443 port, so the previous API ping didn't work for this case.
Capsule is now supported since we just check if katello-ca-consumer-latest rpm is available
to tell that Satellite version is 6 or beyond.