From 14b5a87f270978a1d749425e517cecf8236e2dd4 Mon Sep 17 00:00:00 2001 From: bender Date: Thu, 27 Feb 2025 15:53:08 +0100 Subject: [PATCH 1/2] #405 ADD ansible-playbook proxy bin --- proxy/bin/ansible-playbook | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100755 proxy/bin/ansible-playbook diff --git a/proxy/bin/ansible-playbook b/proxy/bin/ansible-playbook new file mode 100755 index 00000000..29abf5bf --- /dev/null +++ b/proxy/bin/ansible-playbook @@ -0,0 +1,18 @@ +#! /usr/bin/env bash + +set -e +set -u + +ANSIBLE_VERSION="${ANSIBLE_VERSION:-}" + +if command -v ansible-playbook &>/dev/null; then + exec ansible-playbook "$@" +else + if [[ -n "$ANSIBLE_VERSION" ]]; then + flock /tmp/ansible-playbook-install pip install "ansible-core==$ANSIBLE_VERSION" ansible 1>&2 + else + flock /tmp/ansible-playbook-install pip install ansible 1>&2 + fi + + exec /usr/local/bin/ansible-playbook "$@" +fi From 743fc0a24a291abd2f57c65078526107e6b2af46 Mon Sep 17 00:00:00 2001 From: bender Date: Thu, 27 Feb 2025 16:28:24 +0100 Subject: [PATCH 2/2] #405 REFACTOR remove --- proxy/bin/ansible-playbook | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/proxy/bin/ansible-playbook b/proxy/bin/ansible-playbook index 29abf5bf..a4798717 100755 --- a/proxy/bin/ansible-playbook +++ b/proxy/bin/ansible-playbook @@ -5,8 +5,8 @@ set -u ANSIBLE_VERSION="${ANSIBLE_VERSION:-}" -if command -v ansible-playbook &>/dev/null; then - exec ansible-playbook "$@" +if [ -f /usr/local/bin/ansible-playbook ]; then + exec /usr/local/bin/ansible-playbook "$@" else if [[ -n "$ANSIBLE_VERSION" ]]; then flock /tmp/ansible-playbook-install pip install "ansible-core==$ANSIBLE_VERSION" ansible 1>&2