Merge "[redhat] Update variables to be version agnostic"

This commit is contained in:
Zuul 2019-09-20 15:23:31 +00:00 committed by Gerrit Code Review
commit e0a7b8c048