openstack/devstack
Code Issues Proposed changes

Move enablement of rhel6-optional repo earlier

Browse Source 
Change 4f1fee6eae 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
This commit is contained in:
Ian Wienand 2014-02-26 13:29:31 +11:00
parent e26b7bb415
commit 3e37326a35
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
stack.sh
View File

@ -194,6 +194,10 @@ if [[ is_fedora && $DISTRO =~ (rhel6) ]]; then
yum_install ${RHEL6_EPEL_RPM} || \
die $LINENO "Error installing EPEL repo, cannot continue"
fi
# ... and also optional to be enabled
sudo yum-config-manager --enable rhel-6-server-optional-rpms
fi

4
tools/fixup_stuff.sh
View File

@ -98,10 +98,6 @@ if [[ $DISTRO =~ (rhel6) ]]; then
sudo setenforce 0
fi
# make sure we have the "optional" repo enabled; it provides some
# packages like libffi-devel for example
sudo yum-config-manager --enable rhel-6-server-optional-rpms
# If the ``dbus`` package was installed by DevStack dependencies the
# uuid may not be generated because the service was never started (PR#598200),
# causing Nova to stop later on complaining that ``/var/lib/dbus/machine-id``