Merge pull request #266 from amanda11/mongo_36

Mongo 4.0 support for ansible - addressing issue #264

Author: armab

roles/StackStorm.mongodb/defaults/main.yml

@@ -1,6 +1,3 @@
 ---
-# MongoDB3 version to install
-# Should be '3.2' or '3.4'
-mongodb_version: "3.4"
-# MongoDB4 version to install on RH 8
-mongodb4_version: "4.0"
+# MongoDB default version
+mongodb_version: "4.0"

roles/StackStorm.mongodb/tasks/mongodb_redhat.yml

@@ -37,7 +37,7 @@
 - name: yum | Install mongodb
   become: yes
   yum:
-    name: mongodb-org-{{ mongodb_use_version }}*
+    name: mongodb-org-{{ mongodb_version }}*
     state: present
     # TODO: Allow yum downgrade since Ansible 2.4
     # https://github.com/ansible/ansible/pull/21516

roles/StackStorm.mongodb/vars/debian.yml

@@ -1,6 +1,6 @@
-# Extract mongodb "major.minor" version
-mongodb_major_minor_version: "{{ (mongodb_version|string)[:3] }}"
 # Use the following URL to find the key: https://www.mongodb.org/static/pgp/server-{{ mongodb_major_minor_version }}.asc
 mongodb_apt_keys:
   "3.2": "42F3E95A2C4F08279C4960ADD68FA50FEA312927"
   "3.4": "0C49F3730359A14518585931BC711F9BA15703C6"
+  "3.6": "2930ADAE8CAF5059EE73BB4B58712A2291FA4AD5"
+  "4.0": "9DA31620334BD75D9DCB49F368818C72E52529D4"

roles/StackStorm.mongodb/vars/main.yml

@@ -0,0 +1,2 @@
+# Extract mongodb "major.minor" version
+mongodb_major_minor_version: "{{ (mongodb_version|string)[:3] }}"

roles/StackStorm.mongodb/vars/redhat.yml

@@ -3,7 +3,3 @@ mongo_dependencies:
       - pyOpenSSL
       - python-pyasn1
       - python-ndg_httpsclient
-# For RH < 8 use mongodb_version
-mongodb_use_version: "{{ (mongodb_version|string)[:3] }}"
-# Extract mongodb "major.minor" version
-mongodb_major_minor_version: "{{ (mongodb_use_version|string)[:3] }}"

roles/StackStorm.mongodb/vars/redhat_8.yml

@@ -2,9 +2,3 @@ mongo_dependencies:
       - python3-urllib3
       - python3-pyOpenSSL
       - python3-pyasn1
-# We cannot have conditional defaults. The default for mongodb_version is 3, but
-# for RH 8 we want to use version 4 at least. So if mongodb_version is 3 use the
-# default mongodb4_version
-mongodb_use_version: "{{ (mongodb4_version|string)[:3] if ( mongodb_version|string)[:1] == '3' else (mongodb_version|string)[:3] }}"
-# Extract mongodb "major.minor" version
-mongodb_major_minor_version: "{{ (mongodb_use_version|string)[:3] }}"