Skip to content

Commit 79aea9a

Browse files
committed
Few more fixes
1 parent 606210c commit 79aea9a

File tree

6 files changed

+32
-20
lines changed

6 files changed

+32
-20
lines changed

.travis.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,6 @@ env:
4848
DISTRIBUTION=debian
4949
DIST_VERSION=9-builded
5050
MONGODB_VERSION=3.6
51-
MONGODB_PACKAGE=mongodb-org
5251
- >
5352
DISTRIBUTION=debian
5453
DIST_VERSION=8-builded

defaults/main.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ mongodb_manage_service: true
1818
mongodb_disable_transparent_hugepages: false
1919

2020
mongodb_user: "{{ 'mongod' if ('RedHat' == ansible_os_family) else 'mongodb' }}"
21-
mongodb_uid: ""
22-
mongodb_gid: ""
21+
mongodb_uid:
22+
mongodb_gid:
2323
mongodb_daemon_name: "{{ 'mongod' if ('mongodb-org' in mongodb_package) else 'mongodb' }}"
2424

2525
## net Options

tasks/configure.yml

Lines changed: 21 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,40 @@
11
---
2+
- name: create mongodb group
3+
group:
4+
name: "{{ mongodb_user }}"
5+
state: present
26

3-
- debug:
4-
msg: "{{ mongodb_replication_replset }}"
7+
- name: create mongodb user
8+
user:
9+
name: "{{ mongodb_user }}"
10+
group: "{{ mongodb_user }}"
11+
state: present
512

6-
- name: Create keyFile
7-
copy:
8-
dest: "{{ mongodb_security_keyfile }}"
9-
content: "{{ mongodb_keyfile_content }}"
10-
owner: "{{ mongodb_user }}"
11-
group: "root"
12-
mode: 0600
13-
when: mongodb_replication_replset | length > 0
13+
# Workaround because default(omit) is not working. At least in Ansible 2.8.
1414

1515
- name: set mongodb gid
1616
group:
1717
name: "{{ mongodb_user }}"
1818
gid: "{{ mongodb_gid }}"
1919
state: present
20-
when: mongodb_gid | length > 0
20+
when: mongodb_gid is defined
2121

2222
- name: set mongodb uid
2323
user:
2424
name: "{{ mongodb_user }}"
2525
uid: "{{ mongodb_uid }}"
2626
group: "{{ mongodb_user }}"
2727
state: present
28-
when: mongodb_uid | length > 0
28+
when: mongodb_uid is defined
29+
30+
- name: Create keyFile
31+
copy:
32+
dest: "{{ mongodb_security_keyfile }}"
33+
content: "{{ mongodb_keyfile_content }}"
34+
owner: "{{ mongodb_user }}"
35+
group: "root"
36+
mode: 0600
37+
when: mongodb_replication_replset | length > 0
2938

3039
- name: Create log dir if missing
3140
file:

tasks/install.debian.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,8 @@
6161
- name: Add systemd configuration if present
6262
copy: src=mongodb.service dest=/lib/systemd/system/mongodb.service owner=root group=root mode=0644
6363
when: ansible_service_mgr == "systemd"
64+
notify:
65+
- reload systemd
6466

6567
- name: Add symlink for systemd
6668
file: src=/lib/systemd/system/mongodb.service dest=/etc/systemd/system/multi-user.target.wants/mongodb.service state=link

tasks/install.redhat.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@
1515
dest: /etc/yum.repos.d/mongodb.repo
1616
mode: 0644
1717
with_items: "{{ mongodb_major_version }}"
18+
loop_control:
19+
loop_var: version_item
1820
when: mongodb_package == 'mongodb-org'
1921

2022
- name: Install MongoDB package
@@ -38,11 +40,11 @@
3840
name:
3941
- python-devel
4042
- python-pip
41-
when: mongodb_pymongo_from_pip
43+
when: mongodb_pymongo_from_pip | bool
4244

4345
- name: Install PyMongo from PIP
4446
pip:
4547
name: pymongo
4648
state: "{{ mongodb_pymongo_pip_version is defined | ternary('present', 'latest') }}"
4749
version: "{{ mongodb_pymongo_pip_version | default(omit) }}"
48-
when: mongodb_pymongo_from_pip
50+
when: mongodb_pymongo_from_pip | bool

templates/mongodb.repo.j2

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
[mongodb-org-{{ mongodb_major_version }}]
22
name=MongoDB {{ mongodb_major_version }} Repository
3-
baseurl={{ mongodb_repository[item] }}
4-
{% if mongodb_repository_gpgkey[item] is defined and mongodb_repository_gpgkey[item] != '' %}
3+
baseurl={{ mongodb_repository[version_item] }}
4+
{% if mongodb_repository_gpgkey[version_item] is defined and mongodb_repository_gpgkey[version_item] != '' %}
55
gpgcheck=1
6-
gpgkey={{ mongodb_repository_gpgkey[item] }}
6+
gpgkey={{ mongodb_repository_gpgkey[version_item] }}
77
{% else %}
88
gpgcheck=0
99
{% endif %}

0 commit comments

Comments
 (0)