Browse code

Merge "Simplify RDO install"

Jenkins authored on 2015/10/15 13:17:49
Showing 1 changed files
... ...
@@ -287,14 +287,7 @@ EOF
287 287
     # ... and also optional to be enabled
288 288
     sudo yum-config-manager --enable rhel-7-server-optional-rpms
289 289
 
290
-    RHEL_RDO_REPO_RPM=${RHEL7_RDO_REPO_RPM:-"https://repos.fedorapeople.org/repos/openstack/openstack-kilo/rdo-release-kilo-1.noarch.rpm"}
291
-    RHEL_RDO_REPO_ID=${RHEL7_RDO_REPO_ID:-"openstack-kilo"}
292
-
293
-    if ! sudo yum repolist enabled $RHEL_RDO_REPO_ID | grep -q $RHEL_RDO_REPO_ID; then
294
-        echo "RDO repo not detected; installing"
295
-        yum_install $RHEL_RDO_REPO_RPM || \
296
-            die $LINENO "Error installing RDO repo, cannot continue"
297
-    fi
290
+    sudo yum install -y https://rdoproject.org/repos/rdo-release.rpm
298 291
 
299 292
     if is_oraclelinux; then
300 293
         sudo yum-config-manager --enable ol7_optional_latest ol7_addons ol7_MySQL56