openstack/devstack
Code Issues Proposed changes

Merge "Ensure yum-utils is installed before using yum-config-manager"

Browse Source
This commit is contained in:
Jenkins 2015-06-23 20:09:04 +00:00 committed by Gerrit Code Review
commit a9d510604c
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
stack.sh
View File

@ -263,6 +263,7 @@ gpgcheck=0
EOF EOF
# Enable a bootstrap repo. It is removed after finishing # Enable a bootstrap repo. It is removed after finishing
# the epel-release installation. # the epel-release installation.
is_package_installed yum-utils || install_package yum-utils
sudo yum-config-manager --enable epel-bootstrap sudo yum-config-manager --enable epel-bootstrap
yum_install epel-release || \ yum_install epel-release || \
die $LINENO "Error installing EPEL repo, cannot continue" die $LINENO "Error installing EPEL repo, cannot continue"
@ -270,7 +271,6 @@ EOF
sudo rm -f /etc/yum.repos.d/epel-bootstrap.repo sudo rm -f /etc/yum.repos.d/epel-bootstrap.repo
# ... and also optional to be enabled # ... and also optional to be enabled
is_package_installed yum-utils || install_package yum-utils
sudo yum-config-manager --enable rhel-7-server-optional-rpms sudo yum-config-manager --enable rhel-7-server-optional-rpms
RHEL_RDO_REPO_RPM=${RHEL7_RDO_REPO_RPM:-"https://repos.fedorapeople.org/repos/openstack/openstack-juno/rdo-release-juno-1.noarch.rpm"} RHEL_RDO_REPO_RPM=${RHEL7_RDO_REPO_RPM:-"https://repos.fedorapeople.org/repos/openstack/openstack-juno/rdo-release-juno-1.noarch.rpm"}