aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--deployed-server/deployed-server-roles-data.yaml22
-rw-r--r--extraconfig/pre_deploy/rhel-registration/scripts/rhel-registration17
-rw-r--r--releasenotes/notes/sat_capsule-bb59fad44c17f97f.yaml7
3 files changed, 15 insertions, 31 deletions
diff --git a/deployed-server/deployed-server-roles-data.yaml b/deployed-server/deployed-server-roles-data.yaml
index 877fc7d..8611940 100644
--- a/deployed-server/deployed-server-roles-data.yaml
+++ b/deployed-server/deployed-server-roles-data.yaml
@@ -34,12 +34,6 @@
- StorageMgmt
- Tenant
HostnameFormatDefault: '%stackname%-controller-%index%'
- # Deprecated & backward-compatible values (FIXME: Make parameters consistent)
- # Set uses_deprecated_params to True if any deprecated params are used.
- uses_deprecated_params: True
- deprecated_param_extraconfig: 'controllerExtraConfig'
- deprecated_param_flavor: 'OvercloudControlFlavor'
- deprecated_param_image: 'controllerImage'
ServicesDefault:
- OS::TripleO::Services::AodhApi
- OS::TripleO::Services::AodhEvaluator
@@ -174,15 +168,6 @@
- InternalApi
- Tenant
- Storage
- # Deprecated & backward-compatible values (FIXME: Make parameters consistent)
- # Set uses_deprecated_params to True if any deprecated params are used.
- uses_deprecated_params: True
- deprecated_param_image: 'NovaImage'
- deprecated_param_extraconfig: 'NovaComputeExtraConfig'
- deprecated_param_metadata: 'NovaComputeServerMetadata'
- deprecated_param_scheduler_hints: 'NovaComputeSchedulerHints'
- deprecated_param_ips: 'NovaComputeIPs'
- deprecated_server_resource_name: 'NovaCompute'
ServicesDefault:
- OS::TripleO::Services::AuditD
- OS::TripleO::Services::CACerts
@@ -256,13 +241,6 @@
- InternalApi
- Storage
- StorageMgmt
- # Deprecated & backward-compatible values (FIXME: Make parameters consistent)
- # Set uses_deprecated_params to True if any deprecated params are used.
- uses_deprecated_params: True
- deprecated_param_metadata: 'SwiftStorageServerMetadata'
- deprecated_param_ips: 'SwiftStorageIPs'
- deprecated_param_image: 'SwiftStorageImage'
- deprecated_param_flavor: 'OvercloudSwiftStorageFlavor'
disable_upgrade_deployment: True
ServicesDefault:
- OS::TripleO::Services::AuditD
diff --git a/extraconfig/pre_deploy/rhel-registration/scripts/rhel-registration b/extraconfig/pre_deploy/rhel-registration/scripts/rhel-registration
index 487857e..d754aaf 100644
--- a/extraconfig/pre_deploy/rhel-registration/scripts/rhel-registration
+++ b/extraconfig/pre_deploy/rhel-registration/scripts/rhel-registration
@@ -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"
diff --git a/releasenotes/notes/sat_capsule-bb59fad44c17f97f.yaml b/releasenotes/notes/sat_capsule-bb59fad44c17f97f.yaml
new file mode 100644
index 0000000..58298d3
--- /dev/null
+++ b/releasenotes/notes/sat_capsule-bb59fad44c17f97f.yaml
@@ -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.