Skip to content

Commit

Permalink
Remove interpreter_python and add pip3
Browse files Browse the repository at this point in the history
Was incorrectly using interpreter_python in a way that caused it to not
be utilized.

Added python3-pip to all places where we were deliberately installing
ansible module dependencies to future proof.
  • Loading branch information
royragsdale committed Jun 9, 2020
1 parent 4d9c601 commit 7a96595
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 8 deletions.
3 changes: 3 additions & 0 deletions ansible/mongodb/tasks/configure_auth.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,9 @@
- python-setuptools
- python-pip
- python-virtualenv
- python3-pip
- python3-virtualenv
- python3-setuptools
state: present

# pymongo is required by the following tasks to create users
Expand Down
8 changes: 6 additions & 2 deletions ansible/pico-docker/tasks/deps.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,12 @@
---

- name: Install pip2
# install both for future compatibility with ansible python3
- name: Install pip
apt:
name: python-pip
name: [
'python-pip',
'python3-pip'
]

- name: Install cryptography (requirement for openssl_csr_module)
pip:
Expand Down
3 changes: 0 additions & 3 deletions infra_local/ansible.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,6 @@ retry_files_enabled = False
display_skipped_hosts = False
nocows = 1

# future
interpreter_python = /usr/bin/python3

[ssh_connection]

# Add "-o IdentitiesOnly=yes" to only use the explicitly set SSH keys
Expand Down
3 changes: 0 additions & 3 deletions infra_remote/ansible.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,6 @@ retry_files_enabled = False
display_skipped_hosts = False
nocows = 1

# future
interpreter_python = /usr/bin/python3

# encrypted secrets
# If you do not want to store your password on your local machine you can
# instead be prompted by using the commented out line.
Expand Down

0 comments on commit 7a96595

Please sign in to comment.