Skip to content

Commit ac0f404

Browse files
committed
Add support python3 as ansible_python_interpreter.
1 parent 4531d91 commit ac0f404

File tree

8 files changed

+45
-15
lines changed

8 files changed

+45
-15
lines changed

library/mongodb_replication.py

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,11 @@
156156
type: string
157157
sample: "replica"
158158
'''
159-
import ConfigParser
159+
import sys
160+
if sys.version_info >= (3, 0):
161+
import configparser
162+
else:
163+
import ConfigParser
160164
import ssl as ssl_lib
161165
import time
162166
from datetime import datetime as dtdatetime

tasks/install.amazon.yml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,16 +28,14 @@
2828

2929
- name: Install PyMongo package
3030
yum:
31-
name: python-pymongo
31+
name: "{{ mongodb_pymongo_package }}"
3232
state: present
3333
lock_timeout: "{{ yum_lock_timeout }}"
3434
when: not mongodb_pymongo_from_pip
3535

3636
- name: Install PIP
3737
yum:
38-
name:
39-
- python-devel
40-
- python-pip
38+
name: "{{ mongodb_pymongo_deps }}"
4139
lock_timeout: "{{ yum_lock_timeout }}"
4240
when: mongodb_pymongo_from_pip
4341

@@ -46,4 +44,5 @@
4644
name: pymongo
4745
state: "{{ mongodb_pymongo_pip_version is defined | ternary('present', 'latest') }}"
4846
version: "{{ mongodb_pymongo_pip_version | default(omit) }}"
47+
executable: "{{ mongodb_pip_executable }}"
4948
when: mongodb_pymongo_from_pip

tasks/install.debian.yml

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -85,25 +85,23 @@
8585

8686
- name: Install PyMongo package
8787
apt:
88-
name: python-pymongo
88+
name: "{{ mongodb_pymongo_package }}"
8989
when: not mongodb_pymongo_from_pip
9090

9191
- name: Install PIP
9292
apt:
93-
pkg:
94-
- python-dev
95-
- python-pip
93+
pkg: "{{ mongodb_pymongo_deps }}"
9694
when: mongodb_pymongo_from_pip | bool
9795

9896
- name: Install setuptools (required for ansible 2.7+)
9997
apt:
100-
pkg:
101-
- python-setuptools
98+
pkg: "{{ mongodb_python_setuptools }}"
10299
when: mongodb_pymongo_from_pip | bool
103100

104101
- name: Install PyMongo from PIP
105102
pip:
106103
name: pymongo
107104
state: "{{ mongodb_pymongo_pip_version is defined | ternary('present', 'latest') }}"
108105
version: "{{ mongodb_pymongo_pip_version | default(omit) }}"
106+
executable: "{{ mongodb_pip_executable }}"
109107
when: mongodb_pymongo_from_pip | bool

tasks/install.redhat.yml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,16 +34,14 @@
3434

3535
- name: Install PyMongo package
3636
yum:
37-
name: python-pymongo
37+
name: "{{ mongodb_pymongo_package }}"
3838
state: present
3939
lock_timeout: "{{ yum_lock_timeout }}"
4040
when: not mongodb_pymongo_from_pip
4141

4242
- name: Install PIP
4343
yum:
44-
name:
45-
- python-devel
46-
- python-pip
44+
name: "{{ mongodb_pymongo_deps }}"
4745
lock_timeout: "{{ yum_lock_timeout }}"
4846
when: mongodb_pymongo_from_pip | bool
4947

@@ -52,4 +50,5 @@
5250
name: pymongo
5351
state: "{{ mongodb_pymongo_pip_version is defined | ternary('present', 'latest') }}"
5452
version: "{{ mongodb_pymongo_pip_version | default(omit) }}"
53+
executable: "{{ mongodb_pip_executable }}"
5554
when: mongodb_pymongo_from_pip | bool

vars/Amazon.yml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,3 +13,10 @@ mongodb_repository_gpgkey:
1313
mongodb_pidfile_path: "{{ '/var/run/mongodb/mongod.pid' if ('mongodb-org' in mongodb_package) else '' }}"
1414

1515
yum_lock_timeout: 180
16+
17+
mongodb_pymongo_package: "{{ 'python3-pymongo' if ansible_python_interpreter is search('python3') | bool else 'python-pymongo' }}"
18+
mongodb_pymongo_deps:
19+
- "{{ 'python3-devel' if ansible_python_interpreter is search('python3') | bool else 'python-devel' }}"
20+
- "{{ 'python3-pip' if ansible_python_interpreter is search('python3') | bool else 'python-pip' }}"
21+
mongodb_pip_executable: "{{ 'pip3' if ansible_python_interpreter is search('python3') | bool else 'pip' }}"
22+

vars/Debian.yml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,3 +4,11 @@ mongodb_repository:
44
"3.6": "deb http://repo.mongodb.org/apt/debian {{ ansible_distribution_release }}/mongodb-org/3.6 main"
55
"4.0": "deb http://repo.mongodb.org/apt/debian {{ ansible_distribution_release }}/mongodb-org/4.0 main"
66
"4.2": "deb http://repo.mongodb.org/apt/debian {{ ansible_distribution_release }}/mongodb-org/4.2 main"
7+
8+
mongodb_pymongo_package: "{{ 'python3-pymongo' if ansible_python_interpreter is search('python3') | bool else 'python-pymongo' }}"
9+
mongodb_pymongo_deps:
10+
- "{{ 'python3-dev' if ansible_python_interpreter is search('python3') | bool else 'python-dev' }}"
11+
- "{{ 'python3-pip' if ansible_python_interpreter is search('python3') | bool else 'python-pip' }}"
12+
mongodb_python_setuptools: "{{ 'python3-setuptools' if ansible_python_interpreter is search('python3') | bool else 'python-setuptools' }}"
13+
mongodb_pip_executable: "{{ 'pip3' if ansible_python_interpreter is search('python3') | bool else 'pip' }}"
14+

vars/RedHat.yml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,3 +14,10 @@ mongodb_repository_gpgkey:
1414
mongodb_pidfile_path: "{{ '/var/run/mongodb/mongod.pid' if ('mongodb-org' in mongodb_package) else '' }}"
1515

1616
yum_lock_timeout: 180
17+
18+
mongodb_pymongo_package: "{{ 'python3-pymongo' if ansible_python_interpreter is search('python3') | bool else 'python-pymongo' }}"
19+
mongodb_pymongo_deps:
20+
- "{{ 'python3-devel' if ansible_python_interpreter is search('python3') | bool else 'python-devel' }}"
21+
- "{{ 'python3-pip' if ansible_python_interpreter is search('python3') | bool else 'python-pip' }}"
22+
mongodb_pip_executable: "{{ 'pip3' if ansible_python_interpreter is search('python3') | bool else 'pip' }}"
23+

vars/Ubuntu.yml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,3 +4,11 @@ mongodb_repository:
44
"3.6": "deb http://repo.mongodb.org/apt/ubuntu {{ ansible_distribution_release }}/mongodb-org/3.6 multiverse"
55
"4.0": "deb http://repo.mongodb.org/apt/ubuntu {{ ansible_distribution_release }}/mongodb-org/4.0 multiverse"
66
"4.2": "deb http://repo.mongodb.org/apt/ubuntu {{ ansible_distribution_release }}/mongodb-org/4.2 multiverse"
7+
8+
mongodb_pymongo_package: "{{ 'python3-pymongo' if ansible_python_interpreter is search('python3') | bool else 'python-pymongo' }}"
9+
mongodb_pymongo_deps:
10+
- "{{ 'python3-dev' if ansible_python_interpreter is search('python3') | bool else 'python-dev' }}"
11+
- "{{ 'python3-pip' if ansible_python_interpreter is search('python3') | bool else 'python-pip' }}"
12+
mongodb_python_setuptools: "{{ 'python3-setuptools' if ansible_python_interpreter is search('python3') | bool else 'python-setuptools' }}"
13+
mongodb_pip_executable: "{{ 'pip3' if ansible_python_interpreter is search('python3') | bool else 'pip' }}"
14+

0 commit comments

Comments
 (0)