For 3.11 clusters, master rpm is atomic-openshift, not atomic-openshift-master
@@ -83,14 +83,18 @@ def main():
if not success:
failures += 1
print "Failed to get openshift rpm version:\n" + err.output + + err2.output
-
- # Get openshift master version (upstream or downstream) - only if node rpm found
+ # Get openshift master version (attempt for versions <3.11) - only if node rpm found
if success:
+ openshift_package_name = "atomic-openshift"
success, err = add_specific_rpm_version("{}-master".format(openshift_package_name), rpm_db_path, keys, mts,
"openshift.master.")
+ # Get openshift master version (attempt for versions >=3.11)
+ if not success:
+ success, err2= add_specific_rpm_version("{}".format(openshift_package_name),
+ rpm_db_path, keys, mts, "openshift.master.")
if not success:
# Print notification but don't count this as failure
- print "Note: " + err.output
+ print "Failed to get openshift master rpm version:\n" + err.output + + err2.output
print "Sending these metrics:"
print json.dumps(keys, indent=4)
