Browse files

do cdn activation in rhn-satellite-activate

  • Loading branch information...
1 parent 20fd761 commit 9d7b0e77b3c5870ead90cc863022bbf326b05d1a @jdobes jdobes committed Aug 23, 2016
Showing with 10 additions and 1 deletion.
  1. +10 −1 backend/satellite_tools/rhn_satellite_activate.py
View
11 backend/satellite_tools/rhn_satellite_activate.py
@@ -578,6 +578,12 @@ def main():
def writeError(e):
sys.stderr.write('\nERROR: %s\n' % e)
+ # Handle RHSM manifest
+ if options.manifest:
+ cdn_activate = cdn_activation.Activation(options.manifest, options.rhn_cert)
+ else:
+ cdn_activate = None
+
# general sanity/GPG check
try:
validateSatCert(options.rhn_cert, options.verbose)
@@ -594,7 +600,7 @@ def writeError(e):
'RHN Certificate appears to have expired: %s' % just_date)
return 11
- if not options.sanity_only:
+ if not options.sanity_only and not options.manifest:
prepRhnCert(options)
# remote activation
@@ -640,6 +646,9 @@ def writeError(e):
writeError(e)
return 40
+ elif cdn_activate:
+ cdn_activate.run()
+
return 0

0 comments on commit 9d7b0e7

Please sign in to comment.