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.
(cherry picked from commit 1eca508c57dd987fa6f7a7e6f441096365e6892d)
Change-Id: Ibce834c3e76d71a770013cf1b469aa86396751b9
Ian Wienand authored on 2015/09/25 12:28:58Showing 1 changed files
| ... | ... |
@@ -278,14 +278,7 @@ EOF |
| 278 | 278 |
# ... and also optional to be enabled |
| 279 | 279 |
sudo yum-config-manager --enable rhel-7-server-optional-rpms |
| 280 | 280 |
|
| 281 |
- RHEL_RDO_REPO_RPM=${RHEL7_RDO_REPO_RPM:-"https://repos.fedorapeople.org/repos/openstack/openstack-kilo/rdo-release-kilo-1.noarch.rpm"}
|
|
| 282 |
- RHEL_RDO_REPO_ID=${RHEL7_RDO_REPO_ID:-"openstack-kilo"}
|
|
| 283 |
- |
|
| 284 |
- if ! sudo yum repolist enabled $RHEL_RDO_REPO_ID | grep -q $RHEL_RDO_REPO_ID; then |
|
| 285 |
- echo "RDO repo not detected; installing" |
|
| 286 |
- yum_install $RHEL_RDO_REPO_RPM || \ |
|
| 287 |
- die $LINENO "Error installing RDO repo, cannot continue" |
|
| 288 |
- fi |
|
| 281 |
+ sudo yum install -y https://rdoproject.org/repos/rdo-release.rpm |
|
| 289 | 282 |
|
| 290 | 283 |
if is_oraclelinux; then |
| 291 | 284 |
sudo yum-config-manager --enable ol7_optional_latest ol7_addons ol7_MySQL56 |