openstack/devstack
Code Issues Proposed changes

Merge "Install minimal lsb-release package on openSUSE"

Browse Source
This commit is contained in:
Jenkins 2017-09-28 12:16:50 +00:00 committed by Gerrit Code Review
commit 7c9542eb02
1 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
functions-common
View File

@ -319,10 +319,7 @@ function _ensure_lsb_release {
if [[ -x $(command -v apt-get 2>/dev/null) ]]; then if [[ -x $(command -v apt-get 2>/dev/null) ]]; then
sudo apt-get install -y lsb-release sudo apt-get install -y lsb-release
elif [[ -x $(command -v zypper 2>/dev/null) ]]; then elif [[ -x $(command -v zypper 2>/dev/null) ]]; then
# XXX: old code paths seem to have assumed SUSE platforms also sudo zypper -n install lsb-release
# had "yum". Keep this ordered above yum so we don't try to
# install the rh package. suse calls it just "lsb"
sudo zypper -n install lsb
elif [[ -x $(command -v dnf 2>/dev/null) ]]; then elif [[ -x $(command -v dnf 2>/dev/null) ]]; then
sudo dnf install -y redhat-lsb-core sudo dnf install -y redhat-lsb-core
elif [[ -x $(command -v yum 2>/dev/null) ]]; then elif [[ -x $(command -v yum 2>/dev/null) ]]; then