Skip to content

Commit ec2f2f3

Browse files
UnderGreenUnderGreen
authored
Merge pull request #176 from psabhay/master
Mongodb 4.2 Support
2 parents 196c796 + b15ffee commit ec2f2f3

File tree

8 files changed

+48
-16
lines changed

8 files changed

+48
-16
lines changed

‎.travis.yml‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,11 @@ language: python
66
python:
77
- "2.7"
88
env:
9+
- >
10+
DISTRIBUTION=ubuntu
11+
DIST_VERSION=18_04-builded
12+
MONGODB_VERSION=4.2
13+
MONGODB_PACKAGE=mongodb-org
914
- >
1015
DISTRIBUTION=ubuntu
1116
DIST_VERSION=18_04-builded
@@ -16,6 +21,10 @@ env:
1621
DIST_VERSION=18_04-builded
1722
MONGODB_VERSION=3.6
1823
MONGODB_PACKAGE=mongodb
24+
- >
25+
DISTRIBUTION=ubuntu
26+
DIST_VERSION=16_04-builded
27+
MONGODB_VERSION=4.2
1928
- >
2029
DISTRIBUTION=ubuntu
2130
DIST_VERSION=16_04-builded
@@ -40,6 +49,10 @@ env:
4049
DISTRIBUTION=ubuntu-upstart
4150
DIST_VERSION=14.04
4251
MONGODB_VERSION=3.4
52+
- >
53+
DISTRIBUTION=debian
54+
DIST_VERSION=9-builded
55+
MONGODB_VERSION=4.2
4356
- >
4457
DISTRIBUTION=debian
4558
DIST_VERSION=9-builded
@@ -60,6 +73,10 @@ env:
6073
DISTRIBUTION=debian
6174
DIST_VERSION=8-builded
6275
MONGODB_VERSION=3.4
76+
- >
77+
DISTRIBUTION=centos
78+
DIST_VERSION=6-builded
79+
MONGODB_VERSION=4.2
6380
- >
6481
DISTRIBUTION=centos
6582
DIST_VERSION=6-builded
@@ -72,6 +89,10 @@ env:
7289
DISTRIBUTION=centos
7390
DIST_VERSION=6-builded
7491
MONGODB_VERSION=3.4
92+
- >
93+
DISTRIBUTION=centos
94+
DIST_VERSION=7-builded
95+
MONGODB_VERSION=4.2
7596
- >
7697
DISTRIBUTION=centos
7798
DIST_VERSION=7-builded
@@ -84,6 +105,10 @@ env:
84105
DISTRIBUTION=centos
85106
DIST_VERSION=7-builded
86107
MONGODB_VERSION=3.4
108+
- >
109+
DISTRIBUTION=amazonlinux
110+
DIST_VERSION=2-builded
111+
MONGODB_VERSION=4.2
87112
- >
88113
DISTRIBUTION=amazonlinux
89114
DIST_VERSION=2-builded

‎README.md‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -10,16 +10,16 @@ Ansible role which manages [MongoDB](http://www.mongodb.org/).
1010

1111
MongoDB support matrix:
1212

13-
| Distribution | < MongoDB 3.2 | MongoDB 3.4 | MongoDB 3.6 | MongoDB 4.0 |
14-
| -------------- | :-----------: | :----------------: | :----------------: | :----------------: |
15-
| Ubuntu 14.04 | :no_entry: | :white_check_mark: | :white_check_mark: | :white_check_mark: |
16-
| Ubuntu 16.04 | :no_entry: | :white_check_mark: | :white_check_mark: | :white_check_mark: |
17-
| Ubuntu 18.04 | :no_entry: | :x: | :white_check_mark: | :white_check_mark: |
18-
| Debian 8.x | :no_entry: | :white_check_mark: | :white_check_mark: | :white_check_mark: |
19-
| Debian 9.x | :no_entry: | :x: | :white_check_mark: | :white_check_mark: |
20-
| RHEL 6.x | :no_entry: | :white_check_mark: | :white_check_mark: | :white_check_mark: |
21-
| RHEL 7.x | :no_entry: | :white_check_mark: | :white_check_mark: | :white_check_mark: |
22-
| Amazon Linux 2 | :no_entry: | :white_check_mark: | :white_check_mark: | :white_check_mark: |
13+
| Distribution | < MongoDB 3.2 | MongoDB 3.4 | MongoDB 3.6 | MongoDB 4.0 | MongoDB 4.2 |
14+
| -------------- | :-----------: | :----------------: | :----------------: | :----------------: | :----------------: |
15+
| Ubuntu 14.04 | :no_entry: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :x: |
16+
| Ubuntu 16.04 | :no_entry: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: |
17+
| Ubuntu 18.04 | :no_entry: | :x: | :white_check_mark: | :white_check_mark: | :white_check_mark: |
18+
| Debian 8.x | :no_entry: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :x: |
19+
| Debian 9.x | :no_entry: | :x: | :white_check_mark: | :white_check_mark: | :white_check_mark: |
20+
| RHEL 6.x | :no_entry: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: |
21+
| RHEL 7.x | :no_entry: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: |
22+
| Amazon Linux 2 | :no_entry: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: |
2323

2424
- :white_check_mark: - fully tested, should works fine
2525
- :interrobang: - maybe works, not tested

‎defaults/main.yml‎

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

33
mongodb_package: mongodb-org
44
mongodb_package_state: present
5-
mongodb_version: "4.0"
5+
mongodb_version: "4.2"
66
mongodb_apt_keyserver: keyserver.ubuntu.com
77
mongodb_apt_key_id:
88
"3.4": "0C49F3730359A14518585931BC711F9BA15703C6"
99
"3.6": "2930ADAE8CAF5059EE73BB4B58712A2291FA4AD5"
1010
"4.0": "9DA31620334BD75D9DCB49F368818C72E52529D4"
11+
"4.2": "E162F504A20CDF15827F718D4B7C549A058F8B6B"
1112

1213
mongodb_pymongo_from_pip: true # Install latest PyMongo via PIP or package manager
1314
mongodb_pymongo_pip_version: 3.7.1

‎tasks/install.debian.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,23 +17,23 @@
1717

1818
- name: Fail when used wrong mongodb_version variable with Debian Stretch
1919
fail:
20-
msg: "mongodb_version variable should be '3.6' or '4.0' for Debian Stretch"
20+
msg: "mongodb_version variable should be '3.6' or '4.0' or '4.2' for Debian Stretch"
2121
when:
2222
- mongodb_package == 'mongodb-org'
23-
- (mongodb_major_version != '3.6' and mongodb_major_version != '4.0')
23+
- (mongodb_major_version != '3.6' and mongodb_major_version != '4.0' and mongodb_major_version != '4.2')
2424
- ansible_distribution_release == 'stretch'
2525

2626
- name: Fail when used wrong mongodb_version variable with Ubuntu 18.04
2727
fail:
28-
msg: "mongodb_version variable should be '4.0' or else mongodb_package should be 'mongodb' for Ubuntu 18.04"
28+
msg: "mongodb_version variable should be '4.0' or '4.2', or else mongodb_package should be 'mongodb' for Ubuntu 18.04"
2929
when:
3030
- mongodb_package == 'mongodb-org'
31-
- mongodb_major_version != '4.0'
31+
- (mongodb_major_version != '4.0' and mongodb_major_version != '4.2')
3232
- ansible_distribution_release == "bionic"
3333

3434
- name: Fail when used wrong mongodb_version variable
3535
fail:
36-
msg: "mongodb_version variable should be '3.4', '3.6' or '4.0'"
36+
msg: "mongodb_version variable should be '3.4', '3.6' or '4.0' or '4.2'"
3737
when: (mongodb_package == 'mongodb-org' and
3838
(mongodb_version is not defined
3939
or mongodb_repository[mongodb_major_version] is not defined))

‎vars/Amazon.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
11
---
22
mongodb_repository:
3+
"4.2": "https://repo.mongodb.org/yum/amazon/2/mongodb-org/4.2/x86_64/"
34
"4.0": "https://repo.mongodb.org/yum/amazon/2/mongodb-org/4.0/x86_64/"
45
"3.6": "https://repo.mongodb.org/yum/amazon/2013.03/mongodb-org/3.6/x86_64/"
56
"3.4": "https://repo.mongodb.org/yum/amazon/2013.03/mongodb-org/3.4/x86_64/"
67

78
mongodb_repository_gpgkey:
9+
"4.2": "https://www.mongodb.org/static/pgp/server-4.2.asc"
810
"4.0": "https://www.mongodb.org/static/pgp/server-4.0.asc"
911
"3.6": "https://www.mongodb.org/static/pgp/server-3.6.asc"
1012

‎vars/Debian.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,4 @@ mongodb_repository:
33
"3.4": "deb http://repo.mongodb.org/apt/debian {{ ansible_distribution_release }}/mongodb-org/3.4 main"
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"
6+
"4.2": "deb http://repo.mongodb.org/apt/debian {{ ansible_distribution_release }}/mongodb-org/4.2 main"

‎vars/RedHat.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,12 @@ mongodb_repository:
44
"3.4": "https://repo.mongodb.org/yum/redhat/$releasever/mongodb-org/3.4/$basearch/"
55
"3.6": "https://repo.mongodb.org/yum/redhat/$releasever/mongodb-org/3.6/$basearch/"
66
"4.0": "https://repo.mongodb.org/yum/redhat/$releasever/mongodb-org/4.0/$basearch/"
7+
"4.2": "https://repo.mongodb.org/yum/redhat/$releasever/mongodb-org/4.2/$basearch/"
78

89
mongodb_repository_gpgkey:
910
"3.4": "https://www.mongodb.org/static/pgp/server-3.4.asc"
1011
"3.6": "https://www.mongodb.org/static/pgp/server-3.6.asc"
1112
"4.0": "https://www.mongodb.org/static/pgp/server-4.0.asc"
13+
"4.2": "https://www.mongodb.org/static/pgp/server-4.2.asc"
1214

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

‎vars/Ubuntu.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,4 @@ mongodb_repository:
33
"3.4": "deb http://repo.mongodb.org/apt/ubuntu {{ ansible_distribution_release }}/mongodb-org/3.4 multiverse"
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"
6+
"4.2": "deb http://repo.mongodb.org/apt/ubuntu {{ ansible_distribution_release }}/mongodb-org/4.2 multiverse"

0 commit comments

Comments
 (0)