openstack/kolla-ansible
Code Issues Proposed changes

Merge "Fix broken test in vagrant boostrap script"

Browse Source
This commit is contained in:
Jenkins 2016-11-06 06:00:37 +00:00 committed by Gerrit Code Review
commit dcb102608d
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
contrib/dev/vagrant/bootstrap.sh
View File

@ -24,13 +24,13 @@ REGISTRY=${REGISTRY_URL}:${REGISTRY_PORT}
ADMIN_PROTOCOL="http" ADMIN_PROTOCOL="http"
function _ensure_lsb_release { function _ensure_lsb_release {
if [[ -x $(type lsb_release 2>/dev/null) ]]; then if type lsb_release >/dev/null 2>&1; then
return return
fi fi
if [[ -x $(type apt-get 2>/dev/null) ]]; then if type apt-get >/dev/null 2>&1; then
apt-get -y install lsb-release apt-get -y install lsb-release
elif [[ -x $(type yum 2>/dev/null) ]]; then elif type yum >/dev/null 2>&1; then
yum -y install redhat-lsb-core yum -y install redhat-lsb-core
fi fi
} }