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

Add support for ROLESPEC_NO_REINSTALL #12

Open
wants to merge 2 commits 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
3 changes: 3 additions & 0 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -441,6 +441,9 @@ Available variables
- A list of packages to purge before installing PostgreSQL
- ``ROLESPEC_MYSQL_LIBS``
- A list of packages to purge before installing MySQL
- ``ROLESPEC_NO_REINSTALL``
- Do not reinstall existing software. Currently this only
effects ansible.

Test code style
~~~~~~~~~~~~~~~
Expand Down
14 changes: 9 additions & 5 deletions lib/dsl/ansible
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,18 @@ install_ansible() {

sudo apt-get install -yq python-yaml python-jinja2 python-nose \
python-passlib python-crypto

# Avoid a clone error from the directory already existing
if [ -d "${ROLESPEC_ANSIBLE_INSTALL}" ]; then
rm -rf "${ROLESPEC_ANSIBLE_INSTALL}"
# Avoid a clone error from the directory already exists
if [ -n "${ROLESPEC_NO_REINSTALL}" -a ! -d "${ROLESPEC_ANSIBLE_INSTALL}" ] ; then
ROLESPEC_NO_REINSTALL=
fi
if [ -z "${ROLESPEC_NO_REINSTALL}" ] ; then
rm -rf "${ROLESPEC_ANSIBLE_INSTALL}"
fi

git clone --depth 1 --recursive --branch "${branch}" \
if [ -z "${ROLESPEC_NO_REINSTALL}" ] ; then
git clone --depth 1 --recursive --branch "${branch}" \
"${ROLESPEC_ANSIBLE_SOURCE}" "${ROLESPEC_ANSIBLE_INSTALL}"
fi
fi

# Fix the paths for the Ansible binaries
Expand Down