Merge pull request #13 from duhast/master

Configuration and authentication with custom settings fix

Author: UnderGreen

.gitignore

@@ -0,0 +1 @@
+.idea

README.md

@@ -12,6 +12,7 @@ Ansible role which manage [MongoDB](http://www.mongodb.org/)
 ```yaml
 mongodb_package: mongodb-org
 
+mongodb_force_wait_for_port: false                # When not forced, the role will wait for mongod port to become available only with systemd
 mongodb_additional_packages:
 - python-pymongo
 

defaults/main.yml

@@ -1,6 +1,7 @@
 ---
 
 mongodb_package: mongodb-org
+mongodb_force_wait_for_port: false
 
 mongodb_additional_packages:
 - python-pymongo

tasks/auth_initialization.yml

@@ -9,7 +9,7 @@
     name: "{{ item.name }}"
     password: "{{ item.password }}"
     roles: "{{ item.roles }}"
-    login_host: 127.0.0.1
+    login_host: "{{ mongodb_listen_ip }}"
   with_items:
     - {
       name: "{{ mongodb_user_admin_name }}",
@@ -25,7 +25,7 @@
     name: "{{ item.name }}"
     password: "{{ item.password }}"
     roles: "{{ item.roles }}"
-    login_host: 127.0.0.1
+    login_host: "{{ mongodb_listen_ip }}"
     login_user: "{{ mongodb_user_admin_name }}"
     login_password: "{{ mongodb_user_admin_password }}"
   with_items:
@@ -44,22 +44,18 @@
     password: "{{ item.password }}"
     roles: "{{ item.roles }}"
     replica_set: "{{ mongodb_conf_replSet }}"
-    login_host: 127.0.0.1
+    login_host: "{{ mongodb_listen_ip }}"
     login_user: "{{ mongodb_user_admin_name }}"
     login_password: "{{ mongodb_user_admin_password }}"
   with_items:
     - "{{ mongodb_users }}"
   when: mongodb_users is defined and ansible_local.mongodb.mongodb.mongodb_login_port is undefined
 
 - name: Create facts.d directory
-  file:
-    state: directory
-    recurse: yes
-    path: /etc/ansible/facts.d
-  when: rootadmin_user_result|changed or useradmin_user_result|changed
+  file: path=/etc/ansible/facts.d state=directory recurse=yes
+  when: (ansible_local.mongodb.mongodb.mongodb_login_port is undefined) and (rootadmin_user_result|changed or useradmin_user_result|changed or config_result|changed)
 
 - name: Create facts file for mongodb
-  copy:
-    dest: /etc/ansible/facts.d/mongodb.fact
-    content: "[mongodb]\nmongodb_login_port={{ mongodb_conf_port }}\n\n"
-  when: rootadmin_user_result|changed or useradmin_user_result|changed
+  template: src=mongodb.fact.j2 dest=/etc/ansible/facts.d/mongodb.fact
+  when: (ansible_local.mongodb.mongodb.mongodb_login_port is undefined) and (rootadmin_user_result|changed or useradmin_user_result|changed or config_result|changed)
+

tasks/auth_initialization_ald.yml

@@ -1,10 +1,11 @@
+---
 - name: create administrative user siteUserAdmin port=yes
   mongodb_user:
     database: admin
     name: "{{ item.name }}"
     password: "{{ item.password }}"
     roles: "{{ item.roles }}"
-    login_host: 127.0.0.1
+    login_host: "{{ mongodb_listen_ip }}"
     login_port: "{{ ansible_local.mongodb.mongodb.mongodb_login_port }}"
   with_items:
     - {
@@ -19,7 +20,7 @@
     name: "{{ item.name }}"
     password: "{{ item.password }}"
     roles: "{{ item.roles }}"
-    login_host: 127.0.0.1
+    login_host: "{{ mongodb_listen_ip }}"
     login_port: "{{ ansible_local.mongodb.mongodb.mongodb_login_port }}"
     login_user: "{{ mongodb_user_admin_name }}"
     login_password: "{{ mongodb_user_admin_password }}"
@@ -30,14 +31,14 @@
       roles: "root"
       }
 
-- name: create normal users
+- name: create normal users port=yes
   mongodb_user:
     database: "{{ item.database }}"
     name: "{{ item.name }}"
     password: "{{ item.password }}"
     roles: "{{ item.roles }}"
     replica_set: "{{ mongodb_conf_replSet }}"
-    login_host: 127.0.0.1
+    login_host: "{{ mongodb_listen_ip }}"
     login_port: "{{ ansible_local.mongodb.mongodb.mongodb_login_port }}"
     login_user: "{{ mongodb_user_admin_name }}"
     login_password: "{{ mongodb_user_admin_password }}"

tasks/configure.yml

@@ -1,4 +1,12 @@
 ---
+- name: Register default MongoDB listen IP
+  set_fact: mongodb_listen_ip=127.0.0.1
+  when: ansible_local.mongodb.mongodb.mongodb_listen_ip is undefined
+
+- name: Register MongoDB listen IP
+  set_fact: mongodb_listen_ip={{ ansible_local.mongodb.mongodb.mongodb_listen_ip }}
+  when: ansible_local.mongodb.mongodb.mongodb_listen_ip is defined
+
 
 - name: Create keyFile
   copy:
@@ -18,8 +26,8 @@
   when: mongodb_manager_service
 
 - name: wait MongoDB port is listening
-  wait_for: host="{{ mongodb_conf_bind_ip }}"port="{{ mongodb_conf_port }}" delay=10 timeout=60 state=started
-  when: "'systemd' in systemd.stdout"
+  wait_for: host="{{ mongodb_listen_ip }}" port="{{ mongodb_conf_port }}" delay=10 timeout=60 state=started
+  when: mongodb_force_wait_for_port or "'systemd' in systemd.stdout"
 
 - include: auth_initialization.yml
   when: mongodb_conf_auth
@@ -30,11 +38,17 @@
 - name: Configure database directory
   file: state=directory path={{ mongodb_conf_dbpath }} owner={{mongodb_user}} group={{mongodb_user}} mode=0755
 
-- name: Configure logs
-  file: state=file path={{ mongodb_conf_logpath }} owner={{mongodb_user}} group={{mongodb_user}} mode=0644
+- name: Create log dir if missing
+  file: state=directory recurse=yes dest={{ mongodb_conf_logpath|dirname }} owner={{ mongodb_user }} group={{mongodb_user}} mode=0755
+
+- name: Create log if missing
+  file: state=touch dest={{ mongodb_conf_logpath }} owner={{ mongodb_user }} group={{mongodb_user}} mode=0755
+
+- name: Configure log file
+  file: state=file path={{ mongodb_conf_logpath }} owner={{mongodb_user}} group={{mongodb_user}} mode=0755
 
 - name: Configure mongodb
-  template: src=mongod.conf.j2 dest=/etc/mongod.conf owner=root group=root mode=0644
+  template: src=mongod.conf.j2 dest=/etc/mongod.conf backup=yes owner=root group=root mode=0644
   register: config_result
 
 - name: mongodb restart

templates/mongodb.fact.j2

@@ -0,0 +1,3 @@
+[mongodb]
+mongodb_login_port={{ mongodb_conf_port }}
+mongodb_listen_ip={{ mongodb_conf_bind_ip }}