Skip to content

Commit

Permalink
M #-: Only skip Ansible installation in 6.10+
Browse files Browse the repository at this point in the history
  • Loading branch information
xorel committed Sep 2, 2024
1 parent 025a311 commit 569560a
Showing 1 changed file with 9 additions and 6 deletions.
15 changes: 9 additions & 6 deletions minione
Original file line number Diff line number Diff line change
Expand Up @@ -1135,14 +1135,17 @@ fi
check "type -t docker >/dev/null" "Checking docker is installed" 1 \
"SKIP will try to install" || INSTALL_DOCKER=true

# Install newer then system ansible using PIP for some distros
if [[ "${DISTNAME}${DISTVER}" =~ Ubuntu2204|Debian10 ]]; then
# Install newer then system ansible using PIP for some distros or for <=6.8
if [[ "${DISTNAME}${DISTVER}" =~ Ubuntu2204|Debian10 ]] || verlte "$VERSION" 6.8; then
check "type -t $PIP >/dev/null" "Checking ${PYTHON_PIP} is installed" 1 \
"SKIP will try to install" || MISSING_PKGS="${MISSING_PKGS} ${PYTHON_PIP}"

ANSIBLE_VERSION=$(ansible --version | head -1 | tr -cd '[:digit:]' | cut -c 1-3)
check "[ $ANSIBLE_VERSION -ge 215 ]" "Checking ansible version (2.15+)" 1 \
"SKIP will try to install" || MISSING_PIP_PKGS="'ansible==8.7.0'"
if type -t ansible >/dev/null; then
ANSIBLE_VERSION=$(ansible --version | head -1 | tr -cd '[:digit:]' | cut -c 1-3)
check "[ $ANSIBLE_VERSION -ge 215 ]" "Checking ansible version (2.15+)" 1 \
"SKIP will try to install" || MISSING_PIP_PKGS="'ansible==8.7.0'"
else
check "false" "Checking ansible" 1 "SKIP will try to install" || MISSING_PIP_PKGS="'ansible==8.7.0'"
fi
fi

if type -t terraform >/dev/null; then
Expand Down

0 comments on commit 569560a

Please sign in to comment.