Merge branch 'master' of github.com:UnderGreen/ansible-role-mongodb

Author: UnderGreen

.travis.yml

@@ -1,7 +1,12 @@
 # .travis.yml
 ---
 
+dist: trusty
 sudo: required
+language: python
+python:
+  - "2.7"
+  - "3.6"
 env:
   - >
     DISTRIBUTION=ubuntu-upstart
@@ -11,38 +16,6 @@ env:
     DISTRIBUTION=ubuntu-upstart
     DIST_VERSION=14.04
     MONGODB_VERSION=3.2
-  - >
-    DISTRIBUTION=ubuntu-upstart
-    DIST_VERSION=14.04
-    MONGODB_VERSION=3.0
-  - >
-    DISTRIBUTION=ubuntu-upstart
-    DIST_VERSION=14.04
-    MONGODB_VERSION=2.6
-  - >
-    DISTRIBUTION=ubuntu-upstart
-    DIST_VERSION=12.04-builded
-    MONGODB_VERSION=3.4
-  - >
-    DISTRIBUTION=ubuntu-upstart
-    DIST_VERSION=12.04-builded
-    MONGODB_VERSION=3.2
-  - >
-    DISTRIBUTION=ubuntu-upstart
-    DIST_VERSION=12.04-builded
-    MONGODB_VERSION=3.0
-  - >
-    DISTRIBUTION=ubuntu-upstart
-    DIST_VERSION=12.04-builded
-    MONGODB_VERSION=2.6
-  - >
-    DISTRIBUTION=centos
-    DIST_VERSION=6-builded
-    MONGODB_VERSION=2.6
-  - >
-    DISTRIBUTION=centos
-    DIST_VERSION=6-builded
-    MONGODB_VERSION=3.0
   - >
     DISTRIBUTION=centos
     DIST_VERSION=6-builded
@@ -51,14 +24,6 @@ env:
     DISTRIBUTION=centos
     DIST_VERSION=6-builded
     MONGODB_VERSION=3.4
-  - >
-    DISTRIBUTION=centos
-    DIST_VERSION=7-builded
-    MONGODB_VERSION=2.6
-  - >
-    DISTRIBUTION=centos
-    DIST_VERSION=7-builded
-    MONGODB_VERSION=3.0
   - >
     DISTRIBUTION=centos
     DIST_VERSION=7-builded
@@ -68,84 +33,14 @@ env:
     DIST_VERSION=7-builded
     MONGODB_VERSION=3.4
 #  - >
-#    distribution=ubuntu-upstart
-#    version=12.04
-#  - >
 #    distribution=debian
 #    version=7
 
 services:
   - docker
 
-before_install:
-  - sudo apt-get update
-  # Latest Ansible install
-  - sudo apt-add-repository -y ppa:ansible/ansible
-  - sudo apt-get update
-  - sudo apt-get install ansible python-pip -y
-  - sudo pip install docker-py==1.5.0
-  # 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
+install:
+  - bash tests/scripts/before_install.sh
 
 script:
-  # Test 1
-  - >
-    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'
-    && (echo 'Idempotence test: pass' && exit 0)
-    || (echo 'Idempotence test: fail' && exit 1)
-
-    # Delete all containers
-  - sudo docker kill mongo{1,2,3} && docker rm mongo{1,2,3}
-
-  # Test 2
-  - >
-    sudo ansible-playbook -i tests/hosts tests/site.yml -e target=mongo1 -e image_name=${DISTRIBUTION}:${DIST_VERSION}
-    -e mongodb_version=${MONGODB_VERSION} -e mongodb_security_authorization='enabled'
-    # Idempotence test
-  - >
-    sudo ansible-playbook -i tests/hosts tests/site.yml -e target=mongo1 -e image_name=${DISTRIBUTION}:${DIST_VERSION}
-    -e mongodb_version=${MONGODB_VERSION} -e mongodb_security_authorization='enabled'
-    | grep -q 'changed=0.*failed=0'
-    && (echo 'Idempotence test: pass' && exit 0)
-    || (echo 'Idempotence test: fail' && exit 1)
-
-    # Delete all containers
-  - sudo docker kill mongo{1,2,3} && docker rm mongo{1,2,3}
-
-  # Test 3
-  - >
-    sudo ansible-playbook -i tests/hosts tests/site.yml -e target=mongo -e image_name=${DISTRIBUTION}:${DIST_VERSION}
-    -e mongodb_version=${MONGODB_VERSION} -e mongodb_replication_replset='testrs'
-    # Idempotence test
-  - >
-    sudo ansible-playbook -i tests/hosts tests/site.yml -e target=mongo -e image_name=${DISTRIBUTION}:${DIST_VERSION}
-    -e mongodb_version=${MONGODB_VERSION} -e mongodb_replication_replset='testrs'
-    | grep -q 'changed=0.*failed=0'
-    && (echo 'Idempotence test: pass' && exit 0)
-    || (echo 'Idempotence test: fail' && exit 1)
-
-    # Delete all containers
-  - sudo docker kill mongo{1,2,3} && docker rm mongo{1,2,3}
-
-  # Test 4
-  - >
-    sudo ansible-playbook -i tests/hosts tests/site.yml -e target=mongo -e image_name=${DISTRIBUTION}:${DIST_VERSION}
-    -e mongodb_version=${MONGODB_VERSION} -e mongodb_replication_replset='testrs'
-    -e mongodb_security_authorization='enabled'
-    # Idempotence test
-  - >
-    sudo ansible-playbook -i tests/hosts tests/site.yml -e target=mongo -e image_name=${DISTRIBUTION}:${DIST_VERSION}
-    -e mongodb_version=${MONGODB_VERSION} -e mongodb_replication_replset='testrs'
-    -e mongodb_security_authorization='enabled'
-    | grep -q 'changed=0.*failed=0'
-    && (echo 'Idempotence test: pass' && exit 0)
-    || (echo 'Idempotence test: fail' && exit 1)
-
+  - bash tests/scripts/test.sh

README.md

@@ -13,16 +13,15 @@ MongoDB support matrix:
 | 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:|
+| Debian 9.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  
-:x: - don't have official support  
+:white_check_mark: - fully tested, should work fine
+:interrobang: - will be added testing suite soon
+:x: - don't have official support
 :no_entry: - does't have support, because used old format of configuration files
 
 #### Variables
@@ -89,7 +88,7 @@ mongodb_replication_oplogsize: 1024               # specifies a maximum size in
 
 ## setParameter options
 # Configure setParameter option.
-# Example : 
+# Example :
 mongodb_set_parameters: { "enableLocalhostAuthBypass": "true", "authenticationMechanisms": "SCRAM-SHA-1,MONGODB-CR" }
 
 # MMS Agent

defaults/main.yml

@@ -1,13 +1,12 @@
 ---
 
 mongodb_package: mongodb-org
-mongodb_version: "3.4"
+mongodb_version: "3.6"
 mongodb_apt_keyserver: keyserver.ubuntu.com
 mongodb_apt_key_id:
-  "2.6": "7F0CEB10"
-  "3.0": "7F0CEB10"
   "3.2": "EA312927"
   "3.4": "0C49F3730359A14518585931BC711F9BA15703C6"
+  "3.6": "2930ADAE8CAF5059EE73BB4B58712A2291FA4AD5"
 
 mongodb_pymongo_from_pip: true                   # Install latest PyMongo via PIP or package manager
 
@@ -41,7 +40,7 @@ mongodb_security_keyfile: /etc/mongodb-keyfile   # Specify path to keyfile with
 mongodb_storage_dbpath: /data/db                 # Directory for datafiles
 # The storage engine for the mongod database. Available values:
 # 'mmapv1', 'wiredTiger'
-mongodb_storage_engine: "{{ 'mmapv1' if mongodb_version[0:3] == '3.0' else 'wiredTiger' }}"
+mongodb_storage_engine: "wiredTiger"
 # mmapv1 specific options
 mongodb_storage_quota_enforced: false            # Limits each database to a certain number of files
 mongodb_storage_quota_maxfiles: 8                # Number of quota files per DB
@@ -95,8 +94,8 @@ mongodb_user_admin_password: passw0rd
 mongodb_root_admin_name: siteRootAdmin
 mongodb_root_admin_password: passw0rd
 
-mongodb_root_backup_name: "backupuser"
-mongodb_root_backup_password: "passw0rd"
+mongodb_root_backup_name: backupuser
+mongodb_root_backup_password: passw0rd
 
 # setParameter config
 mongodb_set_parameters:

library/mongodb_replication.py

@@ -1,6 +1,6 @@
 #!/usr/bin/python
 
-# (c) 2015-2016, Sergei Antipov, 2GIS LLC
+# (c) 2015-2018, Sergei Antipov, 2GIS LLC
 #
 # This file is part of Ansible
 #
@@ -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.2"
+version_added: "2.4"
 options:
     login_user:
         description:
@@ -105,7 +105,7 @@
         default: present
         choices: [ "present", "absent" ]
 notes:
-    - Requires the pymongo Python package on the remote host, version 3.0+. It
+    - Requires the pymongo Python package on the remote host, version 3.2+. It
       can be installed using pip or the OS package manager. @see http://api.mongodb.org/python/current/installation.html
 requirements: [ "pymongo" ]
 author: "Sergei Antipov @UnderGreen"
@@ -166,11 +166,14 @@
 # MongoDB module specific support methods.
 #
 def check_compatibility(module, client):
-    if LooseVersion(PyMongoVersion) <= LooseVersion('3.0'):
-        module.fail_json(msg='Note: you must use pymongo 3.0+')
     srv_info = client.server_info()
-    if LooseVersion(srv_info['version']) >= LooseVersion('3.2') and LooseVersion(PyMongoVersion) <= LooseVersion('3.2'):
-        module.fail_json(msg=' (Note: you must use pymongo 3.2+ with MongoDB >= 3.2)')
+    if LooseVersion(PyMongoVersion) <= LooseVersion('3.2'):
+        module.fail_json(msg='Note: you must use pymongo 3.2+')
+    if LooseVersion(srv_info['version']) >= LooseVersion('3.4') and LooseVersion(PyMongoVersion) <= LooseVersion('3.4'):
+        module.fail_json(msg='Note: you must use pymongo 3.4+ with MongoDB 3.4.x')
+    if LooseVersion(srv_info['version']) >= LooseVersion('3.6') and LooseVersion(PyMongoVersion) <= LooseVersion('3.6'):
+        module.fail_json(msg='Note: you must use pymongo 3.6+ with MongoDB 3.6.x')
+
 
 def check_members(state, module, client, host_name, host_port, host_type):
     admin_db = client['admin']
@@ -236,7 +239,7 @@ def add_host(module, client, host_name, host_port, host_type, timeout=180, **kwa
             cfg['members'].append(new_host)
             admin_db.command('replSetReconfig', cfg)
             return
-        except (OperationFailure, AutoReconnect), e:
+        except (OperationFailure, AutoReconnect) as e:
             timeout = timeout - 5
             if timeout <= 0:
                 module.fail_json(msg='reached timeout while waiting for rs.reconfig(): %s' % str(e))
@@ -265,7 +268,7 @@ def remove_host(module, client, host_name, timeout=180):
                 else:
                     fail_msg = "couldn't find member with hostname: {0} in replica set members list".format(host_name)
                     module.fail_json(msg=fail_msg)
-        except (OperationFailure, AutoReconnect), e:
+        except (OperationFailure, AutoReconnect) as e:
             timeout = timeout - 5
             if timeout <= 0:
                 module.fail_json(msg='reached timeout while waiting for rs.reconfig(): %s' % str(e))
@@ -318,7 +321,7 @@ def main():
     module = AnsibleModule(
         argument_spec = dict(
             login_user=dict(default=None),
-            login_password=dict(default=None),
+            login_password=dict(default=None, no_log=True),
             login_host=dict(default='localhost'),
             login_port=dict(default='27017'),
             replica_set=dict(default=None),
@@ -374,9 +377,9 @@ def main():
                 wait_for_ok_and_master(module, client)
                 replica_set_created = True
                 module.exit_json(changed=True, host_name=host_name, host_port=host_port, host_type=host_type)
-        except OperationFailure, e:
+        except OperationFailure as e:
             module.fail_json(msg='Unable to initiate replica set: %s' % str(e))
-    except ConnectionFailure, e:
+    except ConnectionFailure as e:
         module.fail_json(msg='unable to connect to database: %s' % str(e))
 
     check_compatibility(module, client)
@@ -394,13 +397,13 @@ def main():
                         priority        = float(module.params['priority']),
                         slave_delay     = module.params['slave_delay'],
                         votes           = module.params['votes'])
-        except OperationFailure, e:
+        except OperationFailure as e:
             module.fail_json(msg='Unable to add new member to replica set: %s' % str(e))
 
     elif state == 'absent':
         try:
             remove_host(module, client, host_name)
-        except OperationFailure, e:
+        except OperationFailure as e:
             module.fail_json(msg='Unable to remove member of replica set: %s' % str(e))
 
     module.exit_json(changed=True, host_name=host_name, host_port=host_port, host_type=host_type)