Skip to content

Commit 659299e

Browse files
ftxftx
committed
Add suport for MongoDB v4.0
1 parent 0dd9e51 commit 659299e

File tree

7 files changed

+24
-18
lines changed

7 files changed

+24
-18
lines changed

‎README.md‎

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

1111
MongoDB support matrix:
1212

13-
| Distribution | < MongoDB 3.0 | MongoDB 3.2 | MongoDB 3.4 | MongoDB 3.6 |
13+
| Distribution | < MongoDB 3.0 | MongoDB 3.2 | MongoDB 3.4 | MongoDB 3.6 | MongoDB 4.0 |
1414
| ------------ |:-------------:|:-----------:|:-----------:|:-----------:|
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:| :x:| :white_check_mark:|
18-
| Debian 8.x | :no_entry: | :white_check_mark:| :white_check_mark:| :white_check_mark:|
19-
| Debian 9.x | :no_entry: | :white_check_mark:| :x:| :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:|
15+
| Ubuntu 14.04 | :no_entry: | :white_check_mark:| :white_check_mark:| :white_check_mark:| :white_check_mark:|
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:| :x:| :white_check_mark:| :white_check_mark:|
18+
| Debian 8.x | :no_entry: | :white_check_mark:| :white_check_mark:| :white_check_mark:| :white_check_mark:|
19+
| Debian 9.x | :no_entry: | :white_check_mark:| :x:| :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:|
2222

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

‎defaults/main.yml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,10 @@ mongodb_apt_key_id:
77
"3.2": "EA312927"
88
"3.4": "0C49F3730359A14518585931BC711F9BA15703C6"
99
"3.6": "2930ADAE8CAF5059EE73BB4B58712A2291FA4AD5"
10+
"4.0": "9DA31620334BD75D9DCB49F368818C72E52529D4"
1011

1112
mongodb_pymongo_from_pip: true # Install latest PyMongo via PIP or package manager
12-
mongodb_pymongo_pip_version: 3.6.1
13+
mongodb_pymongo_pip_version: 3.7.1
1314

1415
mongodb_user_update_password: "on_create" # MongoDB user password update default policy
1516
mongodb_manage_service: true

‎tasks/install.debian.yml‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
- name: Establish some role-related facts
1010
set_fact:
1111
mongodb_is_systemd: "{{ sbin_init.stat.islnk is defined and sbin_init.stat.islnk }}"
12-
mongodb_major_version: "{{ mongodb_version[0:3] }}"
12+
mongodb_major_version: "{{ mongodb_version[0:4] }}"
1313

1414
- name: Add APT key
1515
apt_key:
@@ -19,21 +19,22 @@
1919

2020
- name: Fail when used wrong mongodb_version variable with Debian Stretch
2121
fail:
22-
msg: "mongodb_version variable should be '3.2' or '3.6' for Debian Stretch"
22+
msg: "mongodb_version variable should be '3.2' or '3.6' or '4.0' for Debian Stretch"
2323
when: (mongodb_package == 'mongodb-org' and
2424
(mongodb_version is not defined
2525
or mongodb_repository[mongodb_major_version] is not defined
26-
or mongodb_version != '3.6') and ansible_distribution_release == 'stretch')
26+
or (mongodb_version != '3.6' and mongodb_version != '4.0'))
27+
and (ansible_distribution_release == 'stretch' and ansible_distribution_release == 'jessie'))
2728

2829
- name: Fail when used wrong mongodb_version variable with Ubuntu 18.04
2930
fail:
30-
msg: "mongodb_version variable should be '3.6' and mongodb_package should be 'mongodb' for Ubuntu 18.04"
31-
when: ((mongodb_package == 'mongodb-org' or mongodb_version != '3.6')
32-
and ansible_distribution_release == "bionic")
31+
msg: "mongodb_version variable should be '3.6' or '4.0' and mongodb_package should be 'mongodb' for Ubuntu 18.04"
32+
when: ((mongodb_package == 'mongodb-org' or (mongodb_version != '3.6' and mongodb_version != '4.0'))
33+
and ansible_distribution_release == "bionic")
3334

3435
- name: Fail when used wrong mongodb_version variable
3536
fail:
36-
msg: "mongodb_version variable should be '3.2', '3.4' or '3.6'"
37+
msg: "mongodb_version variable should be '3.2', '3.4', '3.6' or '4.0'"
3738
when: (mongodb_package == 'mongodb-org' and
3839
(mongodb_version is not defined
3940
or mongodb_repository[mongodb_major_version] is not defined))

‎tasks/install.redhat.yml‎

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

33
- name: Establish some role-related facts
44
set_fact:
5-
mongodb_major_version: "{{ mongodb_version[0:3] }}"
5+
mongodb_major_version: "{{ mongodb_version[0:4] }}"
66

77
- name: Install EPEL release repository
88
package:
@@ -14,7 +14,7 @@
1414
src: mongodb.repo.j2
1515
dest: /etc/yum.repos.d/mongodb.repo
1616
mode: 0644
17-
with_items: "{{ mongodb_version[0:3] }}"
17+
with_items: "{{ mongodb_version[0:4] }}"
1818
when: mongodb_package == 'mongodb-org'
1919

2020
- name: Install MongoDB package

‎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.2": "deb http://repo.mongodb.org/apt/debian {{ ansible_distribution_release }}/mongodb-org/3.2 main"
44
"3.4": "deb http://repo.mongodb.org/apt/debian {{ ansible_distribution_release }}/mongodb-org/3.4 main"
55
"3.6": "deb http://repo.mongodb.org/apt/debian {{ ansible_distribution_release }}/mongodb-org/3.6 main"
6+
"4.0": "deb http://repo.mongodb.org/apt/debian {{ ansible_distribution_release }}/mongodb-org/4.0 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.2": "https://repo.mongodb.org/yum/redhat/$releasever/mongodb-org/3.2/$basearch/"
55
"3.4": "https://repo.mongodb.org/yum/redhat/$releasever/mongodb-org/3.4/$basearch/"
66
"3.6": "https://repo.mongodb.org/yum/redhat/$releasever/mongodb-org/3.6/$basearch/"
7+
"4.0": "https://repo.mongodb.org/yum/redhat/$releasever/mongodb-org/4.0/$basearch/"
78

89
mongodb_repository_gpgkey:
910
"3.2": "https://www.mongodb.org/static/pgp/server-3.2.asc"
1011
"3.4": "https://www.mongodb.org/static/pgp/server-3.4.asc"
1112
"3.6": "https://www.mongodb.org/static/pgp/server-3.6.asc"
13+
"4.0": "https://www.mongodb.org/static/pgp/server-4.0.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.2": "deb http://repo.mongodb.org/apt/ubuntu {{ ansible_distribution_release }}/mongodb-org/3.2 multiverse"
44
"3.4": "deb http://repo.mongodb.org/apt/ubuntu {{ ansible_distribution_release }}/mongodb-org/3.4 multiverse"
55
"3.6": "deb http://repo.mongodb.org/apt/ubuntu {{ ansible_distribution_release }}/mongodb-org/3.6 multiverse"
6+
"4.0": "deb http://repo.mongodb.org/apt/ubuntu {{ ansible_distribution_release }}/mongodb-org/4.0 multiverse"

0 commit comments

Comments
 (0)