Browse code
Move enablement of rhel6-optional repo earlier
Change 4f1fee6eae300a3384900df06ebc857e95854eb0 added the RHEL6
optional repo in fixup_stuff.sh, but it turns out that doesn't get run
until after the package prerequisites phase. Move this into stack.sh
with the RDO repo setup.
Change-Id: Iae0df85fa94c6c1b6f497dd29fda90d03b903a41
Ian Wienand authored on 2014/02/26 11:29:31Showing 2 changed files
| ... | ... |
@@ -194,6 +194,10 @@ if [[ is_fedora && $DISTRO =~ (rhel6) ]]; then |
| 194 | 194 |
yum_install ${RHEL6_EPEL_RPM} || \
|
| 195 | 195 |
die $LINENO "Error installing EPEL repo, cannot continue" |
| 196 | 196 |
fi |
| 197 |
+ |
|
| 198 |
+ # ... and also optional to be enabled |
|
| 199 |
+ sudo yum-config-manager --enable rhel-6-server-optional-rpms |
|
| 200 |
+ |
|
| 197 | 201 |
fi |
| 198 | 202 |
|
| 199 | 203 |
|
| ... | ... |
@@ -98,10 +98,6 @@ if [[ $DISTRO =~ (rhel6) ]]; then |
| 98 | 98 |
sudo setenforce 0 |
| 99 | 99 |
fi |
| 100 | 100 |
|
| 101 |
- # make sure we have the "optional" repo enabled; it provides some |
|
| 102 |
- # packages like libffi-devel for example |
|
| 103 |
- sudo yum-config-manager --enable rhel-6-server-optional-rpms |
|
| 104 |
- |
|
| 105 | 101 |
# If the ``dbus`` package was installed by DevStack dependencies the |
| 106 | 102 |
# uuid may not be generated because the service was never started (PR#598200), |
| 107 | 103 |
# causing Nova to stop later on complaining that ``/var/lib/dbus/machine-id`` |