diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-11-06 06:00:37 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-11-06 06:00:37 +0000 |
| commit | dcb102608d05d20c58c7340f948c94dd4b6da971 (patch) | |
| tree | a3133f0ccfc5abd47f25c83bf80da28915d20415 /contrib | |
| parent | 927721073433e9cad8e264a9c6f9959f9617b867 (diff) | |
| parent | 193a8190ce16d6b356957d77c81c78eaed20d962 (diff) | |
| download | kolla-dcb102608d05d20c58c7340f948c94dd4b6da971.tar.gz kolla-dcb102608d05d20c58c7340f948c94dd4b6da971.zip | |
Merge "Fix broken test in vagrant boostrap script"
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/dev/vagrant/bootstrap.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/contrib/dev/vagrant/bootstrap.sh b/contrib/dev/vagrant/bootstrap.sh index 4e79bb7c2..9bc1fb627 100644 --- a/contrib/dev/vagrant/bootstrap.sh +++ b/contrib/dev/vagrant/bootstrap.sh @@ -24,13 +24,13 @@ REGISTRY=${REGISTRY_URL}:${REGISTRY_PORT} ADMIN_PROTOCOL="http" function _ensure_lsb_release { - if [[ -x $(type lsb_release 2>/dev/null) ]]; then + if type lsb_release >/dev/null 2>&1; then return 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 - elif [[ -x $(type yum 2>/dev/null) ]]; then + elif type yum >/dev/null 2>&1; then yum -y install redhat-lsb-core fi } |