Fixes #7: Allow installation via Pip instead of system package manager.
This commit is contained in:
Jeff Geerling
parent
480b3fe831
commit
c17bf5e903
|
|
@ -12,6 +12,11 @@ env:
|
|||
- MOLECULE_DISTRO: debian9
|
||||
- MOLECULE_DISTRO: debian8
|
||||
|
||||
- MOLECULE_DISTRO: centos7
|
||||
MOLECULE_PLAYBOOK: playbook-pip.yml
|
||||
- MOLECULE_DISTRO: ubuntu1804
|
||||
MOLECULE_PLAYBOOK: playbook-pip.yml
|
||||
|
||||
install:
|
||||
# Install test dependencies.
|
||||
- pip install molecule docker
|
||||
|
|
|
|||
22
README.md
22
README.md
|
|
@ -10,7 +10,15 @@ If using on a RedHat/CentOS-based host, make sure you've added the EPEL reposito
|
|||
|
||||
## Role Variables
|
||||
|
||||
None.
|
||||
Available variables are listed below, along with default values (see `defaults/main.yml`):
|
||||
|
||||
ansible_install_method: package
|
||||
|
||||
Whether to install Ansible via the system `package` manager (`apt`, `yum`, `dnf`, etc.), or via `pip`. If set to `pip`, you need to make sure Pip is installed prior to running this role. You can use the `geerlingguy.pip` module to install Pip easily.
|
||||
|
||||
ansible_install_version_pip: ''
|
||||
|
||||
If `ansible_install_method` is set to `pip`, the specific Ansible version to be installed via Pip. If not set, the latest version of Ansible will be installed.
|
||||
|
||||
## Dependencies
|
||||
|
||||
|
|
@ -18,10 +26,22 @@ None.
|
|||
|
||||
## Example Playbook
|
||||
|
||||
Install from the system package manager:
|
||||
|
||||
- hosts: servers
|
||||
roles:
|
||||
- role: geerlingguy.ansible
|
||||
|
||||
Install from pip:
|
||||
|
||||
- hosts: servers
|
||||
vars:
|
||||
ansible_install_method: pip
|
||||
ansible_install_version_pip: "2.7.0"
|
||||
roles:
|
||||
- role: geerlinguy.pip
|
||||
- role: geerlingguy.ansible
|
||||
|
||||
## License
|
||||
|
||||
MIT / BSD
|
||||
|
|
|
|||
|
|
@ -1,2 +1,8 @@
|
|||
---
|
||||
ansible_default_release: ""
|
||||
|
||||
# Valid options include: 'package' or 'pip'.
|
||||
ansible_install_method: package
|
||||
|
||||
# Used only if ansible_install_method is 'pip'. If empty, defaults to latest.
|
||||
ansible_install_version_pip: ''
|
||||
|
|
|
|||
|
|
@ -1,13 +1,26 @@
|
|||
---
|
||||
# Setup/install tasks.
|
||||
- include_tasks: setup-RedHat.yml
|
||||
when: ansible_os_family == 'RedHat' and ansible_distribution != 'Fedora'
|
||||
when:
|
||||
- ansible_install_method == 'package'
|
||||
- ansible_os_family == 'RedHat'
|
||||
- ansible_distribution != 'Fedora'
|
||||
|
||||
- include_tasks: setup-Fedora.yml
|
||||
when: ansible_distribution == 'Fedora'
|
||||
when:
|
||||
- ansible_install_method == 'package'
|
||||
- ansible_distribution == 'Fedora'
|
||||
|
||||
- include_tasks: setup-Ubuntu.yml
|
||||
when: ansible_distribution == 'Ubuntu'
|
||||
when:
|
||||
- ansible_install_method == 'package'
|
||||
- ansible_distribution == 'Ubuntu'
|
||||
|
||||
- include_tasks: setup-Debian.yml
|
||||
when: ansible_distribution == 'Debian'
|
||||
when:
|
||||
- ansible_install_method == 'package'
|
||||
- ansible_distribution == 'Debian'
|
||||
|
||||
- include_tasks: setup-pip.yml
|
||||
when:
|
||||
- ansible_install_method == 'pip'
|
||||
|
|
|
|||
|
|
@ -1,11 +0,0 @@
|
|||
# Ansible Role tests
|
||||
|
||||
To run the test playbook(s) in this directory:
|
||||
|
||||
1. Install and start Docker.
|
||||
1. Download the test shim (see .travis.yml file for the URL) into `tests/test.sh`:
|
||||
- `wget -O tests/test.sh https://gist.githubusercontent.com/geerlingguy/73ef1e5ee45d8694570f334be385e181/raw/`
|
||||
1. Make the test shim executable: `chmod +x tests/test.sh`.
|
||||
1. Run (from the role root directory) `distro=[distro] playbook=[playbook] ./tests/test.sh`
|
||||
|
||||
If you don't want the container to be automatically deleted after the test playbook is run, add the following environment variables: `cleanup=false container_id=$(date +%s)`
|
||||
|
|
@ -1,96 +0,0 @@
|
|||
#!/bin/bash
|
||||
#
|
||||
# Ansible role test shim.
|
||||
#
|
||||
# Usage: [OPTIONS] ./tests/test.sh
|
||||
# - distro: a supported Docker distro version (default = "centos7")
|
||||
# - playbook: a playbook in the tests directory (default = "test.yml")
|
||||
# - cleanup: whether to remove the Docker container (default = true)
|
||||
# - container_id: the --name to set for the container (default = timestamp)
|
||||
|
||||
# Exit on any individual command failure.
|
||||
set -e
|
||||
|
||||
# Pretty colors.
|
||||
red='\033[0;31m'
|
||||
green='\033[0;32m'
|
||||
neutral='\033[0m'
|
||||
|
||||
timestamp=$(date +%s)
|
||||
|
||||
# Allow environment variables to override defaults.
|
||||
distro=${distro:-"centos7"}
|
||||
playbook=${playbook:-"test.yml"}
|
||||
cleanup=${cleanup:-"true"}
|
||||
container_id=${container_id:-$timestamp}
|
||||
|
||||
## Set up vars for Docker setup.
|
||||
# CentOS 7
|
||||
if [ $distro = 'centos7' ]; then
|
||||
init="/usr/lib/systemd/systemd"
|
||||
opts="--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
|
||||
# CentOS 6
|
||||
elif [ $distro = 'centos6' ]; then
|
||||
init="/sbin/init"
|
||||
opts=""
|
||||
# Ubuntu 16.04
|
||||
elif [ $distro = 'ubuntu1604' ]; then
|
||||
init="/lib/systemd/systemd"
|
||||
opts="--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
|
||||
# Ubuntu 14.04
|
||||
elif [ $distro = 'ubuntu1404' ]; then
|
||||
init="/sbin/init"
|
||||
opts=""
|
||||
# Ubuntu 12.04
|
||||
elif [ $distro = 'ubuntu1204' ]; then
|
||||
init="/sbin/init"
|
||||
opts=""
|
||||
# Debian 8
|
||||
elif [ $distro = 'debian8' ]; then
|
||||
init="/lib/systemd/systemd"
|
||||
opts="--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
|
||||
# Fedora 24
|
||||
elif [ $distro = 'fedora24' ]; then
|
||||
init="/usr/lib/systemd/systemd"
|
||||
opts="--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
|
||||
fi
|
||||
|
||||
# Run the container using the supplied OS.
|
||||
printf ${green}"Starting Docker container: geerlingguy/docker-$distro-ansible."${neutral}"\n"
|
||||
docker pull geerlingguy/docker-$distro-ansible:latest
|
||||
docker run --detach --volume="$PWD":/etc/ansible/roles/role_under_test:rw --name $container_id $opts geerlingguy/docker-$distro-ansible:latest $init
|
||||
|
||||
printf "\n"
|
||||
|
||||
# Install requirements if `requirements.yml` is present.
|
||||
if [ -f "$PWD/tests/requirements.yml" ]; then
|
||||
printf ${green}"Requirements file detected; installing dependencies."${neutral}"\n"
|
||||
docker exec --tty $container_id env TERM=xterm ansible-galaxy install -r /etc/ansible/roles/role_under_test/tests/requirements.yml
|
||||
fi
|
||||
|
||||
printf "\n"
|
||||
|
||||
# Test Ansible syntax.
|
||||
printf ${green}"Checking Ansible playbook syntax."${neutral}
|
||||
docker exec --tty $container_id env TERM=xterm ansible-playbook /etc/ansible/roles/role_under_test/tests/$playbook --syntax-check
|
||||
|
||||
printf "\n"
|
||||
|
||||
# Run Ansible playbook.
|
||||
printf ${green}"Running command: docker exec $container_id env TERM=xterm ansible-playbook /etc/ansible/roles/role_under_test/tests/$playbook"${neutral}
|
||||
docker exec $container_id env TERM=xterm env ANSIBLE_FORCE_COLOR=1 ansible-playbook /etc/ansible/roles/role_under_test/tests/$playbook
|
||||
|
||||
# Run Ansible playbook again (idempotence test).
|
||||
printf ${green}"Running playbook again: idempotence test"${neutral}
|
||||
idempotence=$(mktemp)
|
||||
docker exec $container_id ansible-playbook /etc/ansible/roles/role_under_test/tests/$playbook | tee -a $idempotence
|
||||
tail $idempotence \
|
||||
| grep -q 'changed=0.*failed=0' \
|
||||
&& (printf ${green}'Idempotence test: pass'${neutral}"\n") \
|
||||
|| (printf ${red}'Idempotence test: fail'${neutral}"\n" && exit 1)
|
||||
|
||||
# Remove the Docker container (if configured).
|
||||
if [ "$cleanup" = true ]; then
|
||||
printf "Removing Docker container...\n"
|
||||
docker rm -f $container_id
|
||||
fi
|
||||
|
|
@ -1,5 +0,0 @@
|
|||
---
|
||||
- hosts: all
|
||||
|
||||
roles:
|
||||
- role_under_test
|
||||
Loading…
Reference in New Issue