Merge "Fix rdo-release install" into stable/queens

2019-07-26 09:56:47 +00:00
parent 93a385c005 6f3696c168
commit 2281642c88
1 changed files with 7 additions and 1 deletions
@@ -328,7 +328,13 @@ function _install_rdo {
    # Per the point above, it's a bunch of repos so starts getting a
    # little messy...
    if ! is_package_installed rdo-release ; then
-        yum_install https://rdoproject.org/repos/rdo-release.rpm
+        if [[ "$TARGET_BRANCH" == "master" ]]; then
+            yum_install https://rdoproject.org/repos/rdo-release.rpm
+        else
+            # Get latest rdo-release-$rdo_release RPM package version
+            rdo_release=$(echo $TARGET_BRANCH | sed "s|stable/||g")
+            yum_install https://rdoproject.org/repos/openstack-$rdo_release/rdo-release-$rdo_release.rpm
+        fi
    fi

    # Also enable optional for RHEL7 proper.  Note this is a silent