Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Minor tweaks #7

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 12 additions & 1 deletion .helpers.d/ansible.sh
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,12 @@ function deploy # <env> <app> <tag> [...extra]
if [[ "${repo}" = "web" ]]; then
repo_folder="${RUN_ROOT}/runnable-angular"
fi
if [[ "${repo}" = "api-core" ]]; then
repo_folder="${RUN_ROOT}/api"
fi
if [[ "${repo}" = "api-core" ]]; then
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

you mean worker?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

WIP!!!!! RESPECT THE WIP!!!

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That is what the wip label is for ....

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh, didn't see that... but I did add it to the description! haha

repo_folder="${RUN_ROOT}/api"
fi

if [[ "${tag}" = "" ]]; then
echo "no tag passed, looking for latest commit"
Expand All @@ -26,7 +32,12 @@ function deploy # <env> <app> <tag> [...extra]
fi

echo ansible-playbook -i "${ANSIBLE_ROOT}/${tenv}" --vault-password-file ~/.vaultpass -e git_branch="${tag}" "${deployFile}" -t deploy "${@}"
ansible-playbook -i "${ANSIBLE_ROOT}/${tenv}" --vault-password-file ~/.vaultpass -e git_branch="${tag}" "${deployFile}" -t deploy "${@}"
if [[ $(which noti) == "" ]]; then
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

umm what is noti

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

can this not be done external to the script? alias deployi='noti deploy'

(cd $ANSIBLE_ROOT && ansible-playbook -i "${ANSIBLE_ROOT}/${tenv}" --vault-password-file ~/.vaultpass -e git_branch="${tag}" "${deployFile}" -t deploy "${@}")
else
(cd $ANSIBLE_ROOT && noti ansible-playbook -i "${ANSIBLE_ROOT}/${tenv}" --vault-password-file ~/.vaultpass -e git_branch="${tag}" "${deployFile}" -t deploy "${@}")
fi

}

_deploy()
Expand Down
2 changes: 1 addition & 1 deletion .helpers.d/big-poppa.sh
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ function big_poppa # environment organization/user id/githubid/name value
url="${url}/?${field}=${value}"
fi

ssh $host curl -sS $url | python -m json.tool
ssh $host curl -sS $url | python -m json.tool | pygmentize -l javascript
}

_bp_autocompletion()
Expand Down