diff --git a/.gitignore b/.gitignore index 9ded514..99c4055 100644 --- a/.gitignore +++ b/.gitignore @@ -4,8 +4,9 @@ venv .vault.yml .passbolt.yml inventories/local -inventories/local-* -inventories/*/local-*.yml -inventories/*/local-*.yaml -inventories/host_vars/*.local.yml -inventories/host_vars/*.local.yaml +inventories/local.yml +inventories/local.yaml +inventories/host_vars/*/local.yml +inventories/host_vars/*/local.yaml +inventories/group_vars/*/local.yml +inventories/group_vars/*/local.yaml diff --git a/run-playbook.sh b/run-playbook.sh index 2670ca6..23f5d6a 100755 --- a/run-playbook.sh +++ b/run-playbook.sh @@ -2,34 +2,12 @@ EXTRA_ARGS=() -OPTSTRING=":i:l:" -while getopts ${OPTSTRING} opt; do - case ${opt} in - i) - INVENTORY="$OPTARG" - ;; - l) - LIMIT="$OPTARG" - ;; - esac -done - if [ -f .passbolt.yml ]; then EXTRA_ARGS+=("--extra-vars" "@.passbolt.yml") fi if [ -f .vault-pass ]; then EXTRA_ARGS+=("--vault-password-file" ".vault-pass") fi -if [[ -n "${LIMIT:-}" && -n "${INVENTORY:-}" ]]; then - INVENTORY_DIR=$(dirname "$INVENTORY") - LOCAL_HOST_VARS="$INVENTORY_DIR/host_vars/$LIMIT.local" - if [ -f "$LOCAL_HOST_VARS.yml" ]; then - EXTRA_ARGS+=("--extra-vars" "@$LOCAL_HOST_VARS.yml") - fi - if [ -f "$LOCAL_HOST_VARS.yaml" ]; then - EXTRA_ARGS+=("--extra-vars" "@$LOCAL_HOST_VARS.yaml") - fi -fi #export PYTHONPATH=./venv/lib/python3.12/site-packages/ ansible-playbook ${EXTRA_ARGS[@]} $@