Simplify so default is always 4.0

StackStorm · Jun 29, 2020 · 94e3c4f · 94e3c4f
1 parent 4329b00
commit 94e3c4f
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 22 deletions.
diff --git a/roles/StackStorm.mongodb/defaults/main.yml b/roles/StackStorm.mongodb/defaults/main.yml
@@ -1,5 +1,3 @@
 ---
-# MongoDB default versions, used if mongo_version is not set
-mongodb34_version: "3.4"
-mongodb36_version: "3.6"
-mongodb40_version: "4.0"
+# MongoDB default version
+mongodb_version: "4.0"
diff --git a/roles/StackStorm.mongodb/tasks/mongodb_debian.yml b/roles/StackStorm.mongodb/tasks/mongodb_debian.yml
@@ -25,11 +25,11 @@
     name:
       # re-installing different version of 'mongodb-org' meta package doesn't automatically
       # upgrade or downgrade its dependencies. So we need to explicitly list them one-by-one.
-      - mongodb-org={{ mongodb_use_version }}*
-      - mongodb-org-shell={{ mongodb_use_version }}*
-      - mongodb-org-server={{ mongodb_use_version }}*
-      - mongodb-org-mongos={{ mongodb_use_version }}*
-      - mongodb-org-tools={{ mongodb_use_version }}*
+      - mongodb-org={{ mongodb_version }}*
+      - mongodb-org-shell={{ mongodb_version }}*
+      - mongodb-org-server={{ mongodb_version }}*
+      - mongodb-org-mongos={{ mongodb_version }}*
+      - mongodb-org-tools={{ mongodb_version }}*
     state: present
   register: _task
   retries: 5

diff --git a/roles/StackStorm.mongodb/tasks/mongodb_redhat.yml b/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

diff --git a/roles/StackStorm.mongodb/vars/debian.yml b/roles/StackStorm.mongodb/vars/debian.yml
@@ -1,7 +1,5 @@
-# Set mongodb version to provided value or 3.6 if not specified
-mongodb_use_version: "{{ mongodb_version | default (mongodb40_version) }}"
 # Extract mongodb "major.minor" version
-mongodb_major_minor_version: "{{ (mongodb_use_version|string)[:3] }}"
+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"

diff --git a/roles/StackStorm.mongodb/vars/redhat_6.yml b/roles/StackStorm.mongodb/vars/redhat_6.yml
@@ -3,7 +3,5 @@ mongo_dependencies:
       - pyOpenSSL
       - python-pyasn1
       - python-ndg_httpsclient
-# Set mongodb version to provided value or 3.4 if not specified
-mongodb_use_version: "{{ mongodb_version | default (mongodb34_version) }}"
 # Extract mongodb "major.minor" version
-mongodb_major_minor_version: "{{ (mongodb_use_version|string)[:3] }}"
+mongodb_major_minor_version: "{{ (mongodb_version|string)[:3] }}"
diff --git a/roles/StackStorm.mongodb/vars/redhat_7.yml b/roles/StackStorm.mongodb/vars/redhat_7.yml
@@ -3,7 +3,5 @@ mongo_dependencies:
       - pyOpenSSL
       - python-pyasn1
       - python-ndg_httpsclient
-# Set mongodb version to provided value or 3.6 if not specified
-mongodb_use_version: "{{ mongodb_version | default (mongodb40_version) }}"
 # Extract mongodb "major.minor" version
-mongodb_major_minor_version: "{{ (mongodb_use_version|string)[:3] }}"
+mongodb_major_minor_version: "{{ (mongodb_version|string)[:3] }}"
diff --git a/roles/StackStorm.mongodb/vars/redhat_8.yml b/roles/StackStorm.mongodb/vars/redhat_8.yml
@@ -2,7 +2,5 @@ mongo_dependencies:
       - python3-urllib3
       - python3-pyOpenSSL
       - python3-pyasn1
-# Set mongodb version to provided value or 4.0 if not specified
-mongodb_use_version: "{{ mongodb_version | default (mongodb40_version) }}"
 # Extract mongodb "major.minor" version
-mongodb_major_minor_version: "{{ (mongodb_use_version|string)[:3] }}"
+mongodb_major_minor_version: "{{ (mongodb_version|string)[:3] }}"