openstack
/
tripleo-heat-templates
Code Issues Proposed changes

RHSM: do not use retry to deploy katello-agent 

katello-agent is an optional package, we don't want to use retry.
The package is available or not.

Fixing a regression from https://review.openstack.org/#/c/386529
Since we use "| true", we can't really use "retry" here.

Change-Id: Id8cd9ac54e158ee1743b2f72b169b3a066f69168
Closes-Bug: #1728614
This commit is contained in:
Emilien Macchi 2017-10-30 07:43:04 -07:00
parent a0991433fa
commit d9f7b01c6c
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -247,7 +247,7 @@ case "${REG_METHOD:-}" in
rpm -Uvh katello-ca-consumer-latest.noarch.rpm || true
retry subscription-manager register $opts
retry subscription-manager $repos
retry yum install -y katello-agent || true # needed for errata reporting to satellite6
yum install -y katello-agent || true # needed for errata reporting to satellite6
katello-package-upload
# https://bugs.launchpad.net/tripleo/+bug/1711435