Skip to content

Commit

Permalink
Merge pull request #13 from ax0n-pr1me/update_pip
Browse files Browse the repository at this point in the history
Update debian, pip3 and geerlinguy's packages
  • Loading branch information
thomvaill committed Oct 3, 2022
2 parents fc4df1d + e948133 commit a0d02b6
Show file tree
Hide file tree
Showing 6 changed files with 21 additions and 5 deletions.
11 changes: 10 additions & 1 deletion README.md
Expand Up @@ -148,12 +148,21 @@ You can also manually install the dependencies if your preferer.

### 3. Provision your local machine and deploy the example stack

1. Copy `ansible/group_vars/localhost_overrides.sample.yml` to `ansible/group_vars/localhost_overrides.yml`
2. Add `ansible_user` variable with your user name

```raw
ansible_user: <yourUserName>
```

3. Provision and Deploy

```bash
./tads ansible-playbook localhost provision
./tads ansible-playbook localhost deploy
```

The first command will:
The first `./tads` command will:

- Install Docker on your local machine
- Set up a Swarm cluster with one manager node
Expand Down
6 changes: 6 additions & 0 deletions ansible/provision-00-common.yml
Expand Up @@ -43,4 +43,10 @@
key: "{{ item }}"
with_items: "{{ docker_authorized_ssh_keys }}"

- name: Install Pip
become: True
apt:
name: python3-pip
update_cache: true

# ADD YOUR OWN TASKS HERE
1 change: 1 addition & 0 deletions ansible/provision-01-docker.yml
Expand Up @@ -9,6 +9,7 @@
become: True
roles:
- role: geerlingguy.pip
pip_executable: pip3
vars:
pip_install_packages:
- name: jsondiff # needed by Ansible docker_stack module
Expand Down
4 changes: 2 additions & 2 deletions ansible/requirements.yml
Expand Up @@ -5,7 +5,7 @@
##

- src: geerlingguy.pip
version: 1.3.0
version: 2.1.0

- src: geerlingguy.docker
version: 2.5.2
version: 3.1.2
2 changes: 1 addition & 1 deletion scripts/includes/ansible.sh
Expand Up @@ -21,7 +21,7 @@ check_ansible () {
fi

local current_ansible_version
current_ansible_version="$(ansible --version | head -n1 | cut -d " " -f2)"
current_ansible_version="$(ansible --version | head -n1 | cut -d " " -f3 | cut -c1-4)"

if ! is_version_gte "${current_ansible_version}" "${TADS_MIN_ANSIBLE_VERSION}"; then
echo_red "Your Ansible version (${current_ansible_version}) is not supported by T.A.D.S."
Expand Down
2 changes: 1 addition & 1 deletion vagrant/Vagrantfile
Expand Up @@ -28,7 +28,7 @@ host_suffix = "vagrant-"
Vagrant.configure("2") do |config|
# ** Global config for all machines:
# Use debian 9
config.vm.box = "debian/stretch64"
config.vm.box = "debian/bullseye64"

# Disable default rsync of current host directory
config.vm.synced_folder ".", "/vagrant", disabled: true
Expand Down

0 comments on commit a0d02b6

Please sign in to comment.