Skip to content

Commit 94e3c4f

Browse files
committed
Simplify so default is always 4.0
1 parent 4329b00 commit 94e3c4f

File tree

7 files changed

+12
-22
lines changed

7 files changed

+12
-22
lines changed
Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
11
---
2-
# MongoDB default versions, used if mongo_version is not set
3-
mongodb34_version: "3.4"
4-
mongodb36_version: "3.6"
5-
mongodb40_version: "4.0"
2+
# MongoDB default version
3+
mongodb_version: "4.0"

roles/StackStorm.mongodb/tasks/mongodb_debian.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,11 @@
2525
name:
2626
# re-installing different version of 'mongodb-org' meta package doesn't automatically
2727
# upgrade or downgrade its dependencies. So we need to explicitly list them one-by-one.
28-
- mongodb-org={{ mongodb_use_version }}*
29-
- mongodb-org-shell={{ mongodb_use_version }}*
30-
- mongodb-org-server={{ mongodb_use_version }}*
31-
- mongodb-org-mongos={{ mongodb_use_version }}*
32-
- mongodb-org-tools={{ mongodb_use_version }}*
28+
- mongodb-org={{ mongodb_version }}*
29+
- mongodb-org-shell={{ mongodb_version }}*
30+
- mongodb-org-server={{ mongodb_version }}*
31+
- mongodb-org-mongos={{ mongodb_version }}*
32+
- mongodb-org-tools={{ mongodb_version }}*
3333
state: present
3434
register: _task
3535
retries: 5

roles/StackStorm.mongodb/tasks/mongodb_redhat.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
- name: yum | Install mongodb
3838
become: yes
3939
yum:
40-
name: mongodb-org-{{ mongodb_use_version }}*
40+
name: mongodb-org-{{ mongodb_version }}*
4141
state: present
4242
# TODO: Allow yum downgrade since Ansible 2.4
4343
# https://github.com/ansible/ansible/pull/21516

roles/StackStorm.mongodb/vars/debian.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
1-
# Set mongodb version to provided value or 3.6 if not specified
2-
mongodb_use_version: "{{ mongodb_version | default (mongodb40_version) }}"
31
# Extract mongodb "major.minor" version
4-
mongodb_major_minor_version: "{{ (mongodb_use_version|string)[:3] }}"
2+
mongodb_major_minor_version: "{{ (mongodb_version|string)[:3] }}"
53
# Use the following URL to find the key: https://www.mongodb.org/static/pgp/server-{{ mongodb_major_minor_version }}.asc
64
mongodb_apt_keys:
75
"3.2": "42F3E95A2C4F08279C4960ADD68FA50FEA312927"

roles/StackStorm.mongodb/vars/redhat_6.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,5 @@ mongo_dependencies:
33
- pyOpenSSL
44
- python-pyasn1
55
- python-ndg_httpsclient
6-
# Set mongodb version to provided value or 3.4 if not specified
7-
mongodb_use_version: "{{ mongodb_version | default (mongodb34_version) }}"
86
# Extract mongodb "major.minor" version
9-
mongodb_major_minor_version: "{{ (mongodb_use_version|string)[:3] }}"
7+
mongodb_major_minor_version: "{{ (mongodb_version|string)[:3] }}"

roles/StackStorm.mongodb/vars/redhat_7.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,5 @@ mongo_dependencies:
33
- pyOpenSSL
44
- python-pyasn1
55
- python-ndg_httpsclient
6-
# Set mongodb version to provided value or 3.6 if not specified
7-
mongodb_use_version: "{{ mongodb_version | default (mongodb40_version) }}"
86
# Extract mongodb "major.minor" version
9-
mongodb_major_minor_version: "{{ (mongodb_use_version|string)[:3] }}"
7+
mongodb_major_minor_version: "{{ (mongodb_version|string)[:3] }}"

roles/StackStorm.mongodb/vars/redhat_8.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,5 @@ mongo_dependencies:
22
- python3-urllib3
33
- python3-pyOpenSSL
44
- python3-pyasn1
5-
# Set mongodb version to provided value or 4.0 if not specified
6-
mongodb_use_version: "{{ mongodb_version | default (mongodb40_version) }}"
75
# Extract mongodb "major.minor" version
8-
mongodb_major_minor_version: "{{ (mongodb_use_version|string)[:3] }}"
6+
mongodb_major_minor_version: "{{ (mongodb_version|string)[:3] }}"

0 commit comments

Comments
 (0)