Skip to content

Commit 5ee8162

Browse files
committed
Fixed for Ansible 2.8
1 parent 852ad21 commit 5ee8162

File tree

5 files changed

+17
-25
lines changed

5 files changed

+17
-25
lines changed

handlers/main.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,15 @@
77

88
- name: mongodb reload
99
service: name={{ mongodb_daemon_name }} state=reloaded
10-
when: mongodb_manage_service
10+
when: mongodb_manage_service|bool
1111

1212
- name: mongodb restart
1313
service: name={{ mongodb_daemon_name }} state=restarted
14-
when: mongodb_manage_service
14+
when: mongodb_manage_service|bool
1515

1616
- name: mongodb-mms-monitoring-agent restart
1717
service: name=mongodb-mms-monitoring-agent state=restarted
18-
when: mongodb_manage_service
18+
when: mongodb_manage_service|bool
1919

2020
- name: restart sysfsutils
2121
service: name=sysfsutils state=restarted

tasks/configure.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,22 +7,22 @@
77
owner: "{{ mongodb_user }}"
88
group: "root"
99
mode: 0600
10-
when: mongodb_replication_replset|default("") != ""
10+
when: mongodb_replication_replset | length > 0
1111

1212
- name: set mongodb gid
1313
group:
1414
name: "{{ mongodb_user }}"
1515
gid: "{{ mongodb_gid }}"
1616
state: present
17-
when: mongodb_gid
17+
when: mongodb_gid | length > 0
1818

1919
- name: set mongodb uid
2020
user:
2121
name: "{{ mongodb_user }}"
2222
uid: "{{ mongodb_uid }}"
2323
group: "{{ mongodb_user }}"
2424
state: present
25-
when: mongodb_uid
25+
when: mongodb_uid | length > 0
2626

2727
- name: Create log dir if missing
2828
file:

tasks/install.debian.yml

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,12 @@
11
---
2-
3-
- name: Check if running on systemd
4-
stat: path=/sbin/init
5-
register: sbin_init
6-
changed_when: false
7-
check_mode: no
8-
92
- name: Establish some role-related facts
103
set_fact:
114
mongodb_major_version: "{{ mongodb_version[0:3] }}"
125

136
- name: Disable transparent huge pages on systemd systems
147
include_tasks: disable_transparent_hugepages.yml
158
when:
16-
- mongodb_disable_transparent_hugepages
9+
- mongodb_disable_transparent_hugepages | bool
1710
- ansible_service_mgr == "systemd"
1811

1912
- name: Add APT key
@@ -29,7 +22,7 @@
2922
(mongodb_version is not defined
3023
or mongodb_repository[mongodb_major_version] is not defined
3124
or (mongodb_version != '3.6' and mongodb_version != '4.0'))
32-
and (ansible_distribution_release == 'stretch' and ansible_distribution_release == 'jessie'))
25+
and ansible_distribution_release == 'stretch')
3326

3427
- name: Fail when used wrong mongodb_version variable with Ubuntu 18.04
3528
fail:
@@ -83,11 +76,11 @@
8376
pkg:
8477
- python-dev
8578
- python-pip
86-
when: mongodb_pymongo_from_pip
79+
when: mongodb_pymongo_from_pip | bool
8780

8881
- name: Install PyMongo from PIP
8982
pip:
9083
name: pymongo
9184
state: "{{ mongodb_pymongo_pip_version is defined | ternary('present', 'latest') }}"
9285
version: "{{ mongodb_pymongo_pip_version | default(omit) }}"
93-
when: mongodb_pymongo_from_pip
86+
when: mongodb_pymongo_from_pip | bool

tasks/install.redhat.yml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,9 @@
3232

3333
- name: Install PIP
3434
yum:
35-
name: "{{ item }}"
36-
with_items:
37-
- python-devel
38-
- python-pip
35+
name:
36+
- python-devel
37+
- python-pip
3938
when: mongodb_pymongo_from_pip
4039

4140
- name: Install PyMongo from PIP

tasks/main.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,14 @@
2020

2121
- name: Include replication and auth configuration
2222
include: replication_init_auth.yml
23-
when: ( mongodb_replication_replset is defined
23+
when: ( mongodb_replication_replset | length > 0
2424
and mongodb_security_authorization == 'enabled'
2525
and mongodb_master is defined and mongodb_master )
2626
tags: [mongodb]
2727

2828
- name: Include replication configuration
2929
include: replication.yml
30-
when: mongodb_replication_replset is defined and mongodb_replication_replset
30+
when: mongodb_replication_replset | lenght > 0
3131
tags: [mongodb]
3232

3333
- name: Check where admin user already exists
@@ -101,13 +101,13 @@
101101
login_host: "{{ mongodb_login_host|default('localhost') }}"
102102
with_items:
103103
- "{{ mongodb_oplog_users | default([]) }}"
104-
when: ( mongodb_replication_replset
104+
when: ( mongodb_replication_replset | lenght > 0
105105
and mongodb_security_authorization == 'enabled'
106106
and mongodb_master is defined and mongodb_master )
107107
no_log: false
108108
tags: [mongodb]
109109

110110
- name: Include MMS Agent configuration
111111
include: mms-agent.yml
112-
when: mongodb_mms_api_key
112+
when: mongodb_mms_api_key | lenght > 0
113113
tags: [mongodb]

0 commit comments

Comments
 (0)