Skip to content

Commit 7779fcf

Browse files
committed
Dropped support of EOL versions of MongoDB.
Added testing with Python 2.7.x
1 parent 392b053 commit 7779fcf

File tree

7 files changed

+20
-19
lines changed

7 files changed

+20
-19
lines changed

.travis.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ dist: trusty
55
sudo: required
66
language: python
77
python:
8+
- "2.7"
89
- "3.6"
910
env:
1011
- >

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ MongoDB support matrix:
1414
| ------------ |:-----------:|:-----------:|:-----------:|:-----------:|:-----------:|
1515
| Ubuntu 14.04 | :no_entry: | :white_check_mark: | :white_check_mark: | :white_check_mark:| :x:|
1616
| Ubuntu 16.04 | :no_entry: | :x: | :x: | :x:| :x:|
17-
| Debian 7.x | :no_entry: | :interrobang: | :interrobang: | :interrobang:| :x:|
1817
| Debian 8.x | :no_entry: | :x: | :x: | :x:| :x:|
18+
| Debian 9.x | :no_entry: | :x: | :x: | :x:| :x:|
1919
| RHEL 6.x | :no_entry: | :interrobang: | :interrobang: | :interrobang: | :interrobang: |
2020
| RHEL 7.x | :no_entry: | :interrobang: | :interrobang: | :interrobang: | :interrobang: |
2121

defaults/main.yml

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
11
---
22

33
mongodb_package: mongodb-org
4-
mongodb_version: "3.4"
4+
mongodb_version: "3.6"
55
mongodb_apt_keyserver: keyserver.ubuntu.com
66
mongodb_apt_key_id:
7-
"2.6": "7F0CEB10"
8-
"3.0": "7F0CEB10"
97
"3.2": "EA312927"
108
"3.4": "0C49F3730359A14518585931BC711F9BA15703C6"
9+
"3.6": "2930ADAE8CAF5059EE73BB4B58712A2291FA4AD5"
1110

1211
mongodb_pymongo_from_pip: true # Install latest PyMongo via PIP or package manager
1312

@@ -41,7 +40,7 @@ mongodb_security_keyfile: /etc/mongodb-keyfile # Specify path to keyfile with
4140
mongodb_storage_dbpath: /data/db # Directory for datafiles
4241
# The storage engine for the mongod database. Available values:
4342
# 'mmapv1', 'wiredTiger'
44-
mongodb_storage_engine: "{{ 'mmapv1' if mongodb_version[0:3] == '3.0' else 'wiredTiger' }}"
43+
mongodb_storage_engine: "wiredTiger"
4544
# mmapv1 specific options
4645
mongodb_storage_quota_enforced: false # Limits each database to a certain number of files
4746
mongodb_storage_quota_maxfiles: 8 # Number of quota files per DB
@@ -95,8 +94,8 @@ mongodb_user_admin_password: passw0rd
9594
mongodb_root_admin_name: siteRootAdmin
9695
mongodb_root_admin_password: passw0rd
9796

98-
mongodb_root_backup_name: "backupuser"
99-
mongodb_root_backup_password: "passw0rd"
97+
mongodb_root_backup_name: backupuser
98+
mongodb_root_backup_password: passw0rd
10099

101100
# setParameter config
102101
mongodb_set_parameters:

library/mongodb_replication.py

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
short_description: Adds or removes a node from a MongoDB Replica Set.
2424
description:
2525
- Adds or removes host from a MongoDB replica set. Initialize replica set if it needed.
26-
version_added: "2.2"
26+
version_added: "2.4"
2727
options:
2828
login_user:
2929
description:
@@ -105,7 +105,7 @@
105105
default: present
106106
choices: [ "present", "absent" ]
107107
notes:
108-
- Requires the pymongo Python package on the remote host, version 3.0+. It
108+
- Requires the pymongo Python package on the remote host, version 3.2+. It
109109
can be installed using pip or the OS package manager. @see http://api.mongodb.org/python/current/installation.html
110110
requirements: [ "pymongo" ]
111111
author: "Sergei Antipov @UnderGreen"
@@ -166,11 +166,14 @@
166166
# MongoDB module specific support methods.
167167
#
168168
def check_compatibility(module, client):
169-
if LooseVersion(PyMongoVersion) <= LooseVersion('3.0'):
170-
module.fail_json(msg='Note: you must use pymongo 3.0+')
171169
srv_info = client.server_info()
172-
if LooseVersion(srv_info['version']) >= LooseVersion('3.2') and LooseVersion(PyMongoVersion) <= LooseVersion('3.2'):
173-
module.fail_json(msg=' (Note: you must use pymongo 3.2+ with MongoDB >= 3.2)')
170+
if LooseVersion(PyMongoVersion) <= LooseVersion('3.2'):
171+
module.fail_json(msg='Note: you must use pymongo 3.2+')
172+
if LooseVersion(srv_info['version']) >= LooseVersion('3.4') and LooseVersion(PyMongoVersion) <= LooseVersion('3.4'):
173+
module.fail_json(msg='Note: you must use pymongo 3.4+ with MongoDB 3.4.x')
174+
if LooseVersion(srv_info['version']) >= LooseVersion('3.6') and LooseVersion(PyMongoVersion) <= LooseVersion('3.6'):
175+
module.fail_json(msg='Note: you must use pymongo 3.6+ with MongoDB 3.6.x')
176+
174177

175178
def check_members(state, module, client, host_name, host_port, host_type):
176179
admin_db = client['admin']

vars/Debian.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
---
22
mongodb_repository:
3-
"2.6": "deb http://downloads-distro.mongodb.org/repo/debian-sysvinit dist 10gen"
4-
"3.0": "deb http://repo.mongodb.org/apt/debian wheezy/mongodb-org/3.0 main"
53
"3.2": "deb http://repo.mongodb.org/apt/debian {{ ansible_distribution_release }}/mongodb-org/3.2 main"
64
"3.4": "deb http://repo.mongodb.org/apt/debian {{ ansible_distribution_release }}/mongodb-org/3.4 main"
5+
"3.6": "deb http://repo.mongodb.org/apt/debian {{ ansible_distribution_release }}/mongodb-org/3.6 main"

vars/RedHat.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
---
22

33
mongodb_repository:
4-
"2.6": "http://downloads-distro.mongodb.org/repo/redhat/os/$basearch/"
5-
"3.0": "https://repo.mongodb.org/yum/redhat/$releasever/mongodb-org/3.0/$basearch/"
64
"3.2": "https://repo.mongodb.org/yum/redhat/$releasever/mongodb-org/3.2/$basearch/"
75
"3.4": "https://repo.mongodb.org/yum/redhat/$releasever/mongodb-org/3.4/$basearch/"
6+
"3.6": "https://repo.mongodb.org/yum/redhat/$releasever/mongodb-org/3.6/$basearch/"
87

98
mongodb_repository_gpgkey:
109
"3.2": "https://www.mongodb.org/static/pgp/server-3.2.asc"
1110
"3.4": "https://www.mongodb.org/static/pgp/server-3.4.asc"
11+
"3.6": "https://www.mongodb.org/static/pgp/server-3.6.asc"
1212

1313
mongodb_pidfile_path: "{{ '/var/run/mongodb/mongod.pid' if ('mongodb-org' in mongodb_package) else '' }}"

vars/Ubuntu.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
---
22
mongodb_repository:
3-
"2.6": "deb http://downloads-distro.mongodb.org/repo/ubuntu-upstart dist 10gen"
4-
"3.0": "deb http://repo.mongodb.org/apt/ubuntu {{ ansible_distribution_release }}/mongodb-org/3.0 multiverse"
53
"3.2": "deb http://repo.mongodb.org/apt/ubuntu {{ ansible_distribution_release }}/mongodb-org/3.2 multiverse"
64
"3.4": "deb http://repo.mongodb.org/apt/ubuntu {{ ansible_distribution_release }}/mongodb-org/3.4 multiverse"
5+
"3.6": "deb http://repo.mongodb.org/apt/ubuntu {{ ansible_distribution_release }}/mongodb-org/3.6 multiverse"

0 commit comments

Comments
 (0)