Browse code

Simplify RDO install

We can just directly install the latest RDO repo rather than having to
keep this up-to-date. I don't think there is actually much there we
need any more; there was a lot more coming from RDO in the centos6
days. openvswitch is one big one, however.

Change-Id: I42b8bc1aea8ff61770987eecd5fc3b8309c1e210

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