openstack/devstack
Code Issues Proposed changes

Merge "Move enablement of rhel6-optional repo earlier"

Browse Source
This commit is contained in:
Jenkins 2014-02-26 19:04:11 +00:00 committed by Gerrit Code Review
commit 1c10bb3737
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} || \ yum_install ${RHEL6_EPEL_RPM} || \
die $LINENO "Error installing EPEL repo, cannot continue" die $LINENO "Error installing EPEL repo, cannot continue"
fi fi
# ... and also optional to be enabled
sudo yum-config-manager --enable rhel-6-server-optional-rpms
fi fi

4
tools/fixup_stuff.sh
View File

@ -98,10 +98,6 @@ if [[ $DISTRO =~ (rhel6) ]]; then
sudo setenforce 0 sudo setenforce 0
fi 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 # If the ``dbus`` package was installed by DevStack dependencies the
# uuid may not be generated because the service was never started (PR#598200), # 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`` # causing Nova to stop later on complaining that ``/var/lib/dbus/machine-id``