Resolved conflicts between Daniel White's redhat-support branch and UnderGreen master

Author: jsaliba

.travis.yml

@@ -17,15 +17,15 @@ env:
     MONGODB_VERSION=2.6
   - >
     DISTRIBUTION=ubuntu-upstart
-    DIST_VERSION=12.04
+    DIST_VERSION=12.04-builded
     MONGODB_VERSION=3.2
   - >
     DISTRIBUTION=ubuntu-upstart
-    DIST_VERSION=12.04
+    DIST_VERSION=12.04-builded
     MONGODB_VERSION=3.0
   - >
     DISTRIBUTION=ubuntu-upstart
-    DIST_VERSION=12.04
+    DIST_VERSION=12.04-builded
     MONGODB_VERSION=2.6
   - >
     DISTRIBUTION=centos
@@ -68,17 +68,30 @@ before_install:
   - sudo apt-get update
   - sudo apt-get install ansible python-pip -y
   - sudo pip install docker-py==1.5.0
-  # Pull docker image
-  - sudo docker pull ${DISTRIBUTION}:${DIST_VERSION}
+  # Pull docker image or build it
+  - >
+    if [ -f tests/Dockerfile.${DISTRIBUTION}_${DIST_VERSION} ]; then
+    sudo docker build --rm=true --file=tests/Dockerfile.${DISTRIBUTION}_${DIST_VERSION}
+    --tag ${DISTRIBUTION}:${DIST_VERSION} tests; else sudo docker pull ${DISTRIBUTION}:${DIST_VERSION}; fi
   - sudo ln -s ${PWD} /etc/ansible/roles/greendayonfire.mongodb
 
 script:
   # Test 1
+<<<<<<< HEAD
   - sudo ansible-playbook -i tests/hosts tests/site.yml -e target=mongo1 -e mongodb_version=${MONGODB_VERSION} -e image_name=${DISTRIBUTION}:${DIST_VERSION} 
     # Idempotence test
   - >
     sudo ansible-playbook -i tests/hosts tests/site.yml -e target=mongo1 -e mongodb_version=${MONGODB_VERSION} -e image_name=${DISTRIBUTION}:${DIST_VERSION}
     | grep -q 'changed=0.*failed=0'
+=======
+  - >
+    sudo ansible-playbook -i tests/hosts tests/site.yml -e target=mongo1 -e mongodb_version=${MONGODB_VERSION}
+    -e image_name=${DISTRIBUTION}:${DIST_VERSION}
+    # Idempotence test
+  - >
+    sudo ansible-playbook -i tests/hosts tests/site.yml -e target=mongo1 -e mongodb_version=${MONGODB_VERSION}
+    -e image_name=${DISTRIBUTION}:${DIST_VERSION} | grep -q 'changed=0.*failed=0'
+>>>>>>> 9ba2bbc86a637ae1250cab42ce4f1192f6979fb6
     && (echo 'Idempotence test: pass' && exit 0)
     || (echo 'Idempotence test: fail' && exit 1)
 

README.md

@@ -1,6 +1,6 @@
 Ansible role for MongoDB [![Build Status](https://travis-ci.org/UnderGreen/ansible-role-mongodb.svg?branch=master)](https://travis-ci.org/UnderGreen/ansible-role-mongodb)
 ============
-Ansible role which manage [MongoDB](http://www.mongodb.org/).
+Ansible role which manages [MongoDB](http://www.mongodb.org/).
 
 * Install and configure the MongoDB;
 * Configure mongodb users
@@ -10,17 +10,15 @@ Ansible role which manage [MongoDB](http://www.mongodb.org/).
 
 MongoDB support matrix:
 
-| Distribution | MongoDB 2.4 | MongoDB 2.6 | MongoDB 3.0 | MongoDB 3.2 |
-| ------------ |:-----------:|:-----------:|:-----------:|:-----------:|
-| Ubuntu 14.04 | :no_entry: | :white_check_mark: | :white_check_mark: | :white_check_mark:|
-| Ubuntu 12.04 | :no_entry: | :white_check_mark: | :white_check_mark: | :white_check_mark:|
-| Ubuntu 16.04 | :no_entry: | :x: | :x: | :x:|
-| Debian 7.x | :no_entry: | :interrobang: | :interrobang: | :interrobang:|
-| Debian 8.x | :no_entry: | :x: | :x: | :x:|
-| CentOS 6.x | :no_entry: | :interrobang: | :interrobang: | :interrobang: |
-| CentOS 7.x | :no_entry: | :interrobang: | :interrobang: | :interrobang: |
-| RHEL 6.x | :no_entry: | :interrobang: | :interrobang: | :interrobang: |
-| RHEL 7.x | :no_entry: | :interrobang: | :interrobang: | :interrobang: |
+| Distribution | MongoDB 2.4 | MongoDB 2.6 | MongoDB 3.0 | MongoDB 3.2 | MongoDB 3.4 |
+| ------------ |:-----------:|:-----------:|:-----------:|:-----------:|:-----------:|
+| Ubuntu 14.04 | :no_entry: | :white_check_mark: | :white_check_mark: | :white_check_mark:| :x:|
+| Ubuntu 12.04 | :no_entry: | :white_check_mark: | :white_check_mark: | :white_check_mark:| :x:|
+| Ubuntu 16.04 | :no_entry: | :x: | :x: | :x:| :x:|
+| Debian 7.x | :no_entry: | :interrobang: | :interrobang: | :interrobang:| :x:|
+| Debian 8.x | :no_entry: | :x: | :x: | :x:| :x:|
+| RHEL 6.x | :no_entry: | :interrobang: | :interrobang: | :interrobang: | :interrobang |
+| RHEL 7.x | :no_entry: | :interrobang: | :interrobang: | :interrobang: | :interrobang |
 
 :white_check_mark: - fully tested, should work fine  
 :interrobang: - will be added testing suite soon  
@@ -36,9 +34,9 @@ MongoDB support matrix:
 mongodb_package: mongodb-org
 
 # You can control installed version via this param.
-# Should be '2.6', '3.0' or '3.2'. This role does't support MongoDB < 2.4.
+# Should be '2.6', '3.0', '3.2' or '3.4'. This role does't support MongoDB < 2.4.
 # I will recommend you to use latest version of MongoDB.
-mongodb_version: "3.2"
+mongodb_version: "3.4"
 
 mongodb_force_wait_for_port: false               # When not forced, the role will wait for mongod port to become available only with systemd
 mongodb_pymongo_from_pip: true                   # Install latest PyMongo via PIP or package manager
@@ -139,7 +137,7 @@ Add `greendayonfire.mongodb` to your roles and set vars in your playbook file.
 
 Example vars for authorization:
 ```yaml
-mongodb_security_authorization: true
+mongodb_security_authorization: "enabled"
 mongodb_users:
   - {
     name: testUser,

defaults/main.yml

@@ -1,9 +1,14 @@
 ---
 
 mongodb_package: mongodb-org
-mongodb_version: "3.2"
+mongodb_version: "3.4"
 mongodb_apt_keyserver: keyserver.ubuntu.com
-mongodb_apt_key_id: "{{ 'EA312927' if mongodb_version[0:3] == '3.2' else '7F0CEB10' }}"
+mongodb_apt_key_id:
+  "2.6": "7F0CEB10"
+  "3.0": "7F0CEB10"
+  "3.2": "EA312927"
+  "3.4": "0C49F3730359A14518585931BC711F9BA15703C6"
+
 mongodb_pymongo_from_pip: true                   # Install latest PyMongo via PIP or package manager
 
 mongodb_force_wait_for_port: false

files/mongodb.service

@@ -5,6 +5,8 @@ Documentation=man:mongod(1)
 [Service]
 User=mongodb
 ExecStart=/usr/bin/mongod --config /etc/mongod.conf
+LimitNOFILE=65535
+LimitNPROC=65535
 
 [Install]
 WantedBy=multi-user.target

handlers/main.yml

@@ -14,7 +14,7 @@
 
 - name: reload systemd
   shell: systemctl daemon-reload
-  when: systemd.stat.exists == true and mongodb_manage_service
+  when: mongodb_is_systemd and mongodb_manage_service
 
 - name: restart sysfsutils
   service: name=sysfsutils state=restarted

library/mongodb_replication.py

@@ -23,7 +23,7 @@
 short_description: Adds or removes a node from a MongoDB Replica Set.
 description:
     - Adds or removes host from a MongoDB replica set. Initialize replica set if it needed.
-version_added: "2.1"
+version_added: "2.2"
 options:
     login_user:
         description:
@@ -56,7 +56,7 @@
         required: true
     host_port:
         description:
-            - The port of the host
+            - The port of the host, which should be added/deleted from RS
         required: true
         default: null
     host_type:
@@ -128,6 +128,23 @@
 - mongodb_replication: replica_set=replSet host_name=mongo4.dev host_port=27017 state=absent
 '''
 
+RETURN = '''
+host_name:
+  description: The name of the host to add/remove from replica set
+  returned: success
+  type: string
+  sample: "mongo3.dev"
+host_port:
+  description: The port of the host, which should be added/deleted from RS
+  returned: success
+  type: int
+  sample: 27017
+host_type:
+  description: The type of the host in replica set
+  returned: success
+  type: string
+  sample: "replica"
+'''
 import ConfigParser
 import time
 from distutils.version import LooseVersion

tasks/auth_initialization.yml

@@ -33,6 +33,7 @@
       password: "{{ mongodb_user_admin_password }}",
       roles: "userAdminAnyDatabase"
       }
+  no_log: true
 
 - name: create administrative user siteRootAdmin
   mongodb_user:
@@ -48,6 +49,7 @@
       password: "{{ mongodb_root_admin_password }}",
       roles: "root"
       }
+  no_log: true
 
 - name: create backup user "backupuser"
   mongodb_user:
@@ -63,6 +65,7 @@
       password: "{{ mongodb_root_backup_password }}",
       roles: "backup,clusterMonitor"
       }
+  no_log: true
 
 - name: Move back mongod.conf
   template: src=mongod.conf.j2 dest=/etc/mongod.conf owner=root group=root mode=0644
@@ -71,8 +74,9 @@
   service: name={{ mongodb_daemon_name }} state=restarted
   when: mongodb_manage_service
 
-- name: wait MongoDB port is listening
-  wait_for: host="{{ mongodb_net_bindip }}" port="{{ mongodb_net_port }}" delay=5 state=started
+- name: Wait MongoDB port is listening
+  wait_for: host="{{ item }}" port="{{ mongodb_net_port }}" delay=5 state=started
+  with_items: "{{ mongodb_net_bindip.split(',') | map('replace', '0.0.0.0', '127.0.0.1') | list }}"
 
 - name: stop mongodb if was not started
   shell: "kill {{ pidof_mongod.stdout }}"

tasks/configure.yml

@@ -47,13 +47,12 @@
   service: name={{ mongodb_daemon_name }} state=restarted
   when: config_result|changed and mongodb_manage_service
 
-- name: Set fact about wait_for host address
-  set_fact:
-    wait_for_host: 127.0.0.1
-  when: mongodb_net_bindip == "0.0.0.0"
-  
+- name: Ensure service is started
+  service: name={{ mongodb_daemon_name }} state=started
+
 - name: Wait when mongodb is started
   wait_for:
-    host: "{{ wait_for_host | default(mongodb_net_bindip) }}"
+    host: "{{ item }}"
     port: "{{ mongodb_net_port }}"
     timeout: 120
+  with_items: "{{ mongodb_net_bindip.split(',') | map('replace', '0.0.0.0', '127.0.0.1') | list }}"

tasks/install.debian.yml

@@ -1,39 +1,44 @@
 ---
 
 - name: Check if running on systemd
-  command: cat /proc/1/cmdline
-  register: systemd
+  stat: path=/sbin/init
+  register: sbin_init
   changed_when: false
+  always_run: yes # side-effect free, so it can be run in check-mode as well
+
+- name: Establish some role-related facts
+  set_fact:
+    mongodb_is_systemd: "{{ sbin_init.stat.islnk is defined and sbin_init.stat.islnk }}"
+    mongodb_major_version: "{{ mongodb_version[0:3] }}"
 
 - name: Add systemd configuration if present
   copy: src=mongodb.service dest=/lib/systemd/system/mongodb.service owner=root group=root mode=0640
-  when: "'systemd' in systemd.stdout"
+  when: mongodb_is_systemd
 
 - name: Add symlink for systemd
   file: src=/lib/systemd/system/mongodb.service dest=/etc/systemd/system/multi-user.target.wants/mongodb.service state=link
-  when: "'systemd' in systemd.stdout"
+  when: mongodb_is_systemd
   notify: reload systemd
 
 - meta: flush_handlers
-  when: "'systemd' in systemd.stdout"
+  when: mongodb_is_systemd
 
 - name: Add APT key
   apt_key:
-    keyserver: "{{mongodb_apt_keyserver}}"
-    id: "{{mongodb_apt_key_id}}"
+    keyserver: "{{ mongodb_apt_keyserver }}"
+    id: "{{ mongodb_apt_key_id[mongodb_major_version] }}"
   when: mongodb_package == 'mongodb-org'
-  
+
 - name: Fail when used wrong mongodb_version variable
   fail:
     msg: "mongodb_version variable should be '2.6', '3.0' or '3.2'"
   when: (mongodb_package == 'mongodb-org' and
         (mongodb_version is not defined
-        or mongodb_repository[item] is not defined))
-  with_items: "{{ mongodb_version[0:3] }}"
-  
+         or mongodb_repository[mongodb_major_version] is not defined))
+
 - name: Add APT repository
   apt_repository: repo="{{ mongodb_repository[item] }}" update_cache=yes
-  with_items: "{{ mongodb_version[0:3] }}"
+  with_items: "{{ mongodb_major_version }}"
   when: mongodb_package == 'mongodb-org'
 
 - name: Install MongoDB package
@@ -45,7 +50,7 @@
 - name: reload systemd
   shell: systemctl daemon-reload
   changed_when: false
-  when: "'systemd' in systemd.stdout"
+  when: mongodb_is_systemd
 
 - name: Install PyMongo package
   apt: pkg=python-pymongo state=latest

tasks/main.yml

@@ -30,13 +30,16 @@
 - name: Check user admin is exists
   command: >
     mongo --quiet -u {{ mongodb_user_admin_name }} \
-          -p {{ mongodb_user_admin_password }} --eval 'db.version()' admin
+          -p {{ mongodb_user_admin_password }} --port {{ mongodb_net_port }} --eval 'db.version()' admin
+
   register: mongodb_user_admin_check
   changed_when: false
+  always_run: yes # side-effect free, so it can be run in check-mode as well
   ignore_errors: true
   when: ( mongodb_security_authorization == 'enabled'
           and (not mongodb_replication_replset
           or mongodb_replication_replset == '') )
+  no_log: true
   tags: [mongodb]
 
 - name: Include authorization configuration
@@ -64,6 +67,7 @@
         and mongodb_replication_replset != ''
         and mongodb_security_authorization == 'enabled'
         and mongodb_master is defined and mongodb_master )
+  no_log: true
   tags: [mongodb]
 
 - name: create normal users without replicaset
@@ -81,6 +85,7 @@
   when: ( mongodb_security_authorization == 'enabled'
           and (not mongodb_replication_replset
           or mongodb_replication_replset == '') )
+  no_log: true
   tags: [mongodb]
 
 - name: Include MMS Agent configuration