diff --git a/ansible-local-install.sh b/ansible-local-install.sh index 2783145ce16f69bce203662a82528adf9d916b08..50d872d1da412837626930ad90daa57263cf44d1 100755 --- a/ansible-local-install.sh +++ b/ansible-local-install.sh @@ -52,5 +52,5 @@ fi cd ansible; #Ansible treats values of the extra variables as strings. To pass values that are not strings, we need to use JSON format. -ansible-playbook -i $INVENTORY $FILE --vault-pass-file .pass -e application_version="$VERSION" -e pytimber_major_version="$PYTIMBER_MAJOR_VERSION" $ANSIBLE_PARAMS_AUX; +ansible-playbook -i $INVENTORY $FILE --vault-pass-file .pass -u $USER -e application_version="$VERSION" -e pytimber_major_version="$PYTIMBER_MAJOR_VERSION" $ANSIBLE_PARAMS_AUX; cd .. diff --git a/ansible-playbook.sh b/ansible-playbook.sh index de43793559c87dedc4751bdc69c5e29c98f8b2a5..0f8e3cbbf87fc4f0ec97ae248ed06ba2cc51d51d 100755 --- a/ansible-playbook.sh +++ b/ansible-playbook.sh @@ -6,4 +6,4 @@ PYTIMBER_MAJOR_VERSION=$(cat gradle.properties | grep pytimberMajorVersion | awk INVENTORY="${INVENTORY:-inventory/dev-$USER}" -(cd ansible && ansible-playbook --inventory="$INVENTORY" --vault-password-file=.pass -e application_version="$VERSION" -e pytimber_major_version="$PYTIMBER_MAJOR_VERSION" "$@") +(cd ansible && ansible-playbook --inventory="$INVENTORY" --vault-password-file=.pass -u $USER -e application_version="$VERSION" -e pytimber_major_version="$PYTIMBER_MAJOR_VERSION" "$@") diff --git a/test_utils.sh b/test_utils.sh index d3f6f3925a880bf077bde929913e4235c51fc406..82a01aaf5e6fae99775869374ca43c9ca6cd86f1 100644 --- a/test_utils.sh +++ b/test_utils.sh @@ -28,9 +28,9 @@ run_ansible() { ----------------------------------------- EOF ../gradlew build --refresh-dependencies --no-daemon --parallel - ansible-playbook -i "$INVENTORY" "$FILE" --vault-pass-file "$VAULT_PASS" -e application_version="$PREVIOUS_VERSION" -e pytimber_major_version="$PYTIMBER_MAJOR_VERSION" $ANSIBLE_PARAMS_AUX + ansible-playbook -i "$INVENTORY" "$FILE" --vault-pass-file "$VAULT_PASS" -u $USER -e application_version="$PREVIOUS_VERSION" -e pytimber_major_version="$PYTIMBER_MAJOR_VERSION" $ANSIBLE_PARAMS_AUX else - ansible-playbook -i "$INVENTORY" "$FILE" --vault-pass-file "$VAULT_PASS" -e application_version="$VERSION" -e pytimber_major_version="$PYTIMBER_MAJOR_VERSION" $ANSIBLE_PARAMS_AUX + ansible-playbook -i "$INVENTORY" "$FILE" --vault-pass-file "$VAULT_PASS" -u $USER -e application_version="$VERSION" -e pytimber_major_version="$PYTIMBER_MAJOR_VERSION" $ANSIBLE_PARAMS_AUX fi cd ..