Skip to content

Commit 96fb089

Browse files
author
Donald Morton
committed
Remove Ubuntu 20.04 specific mongodb code.
1 parent c4b8237 commit 96fb089

File tree

3 files changed

+6
-9
lines changed

3 files changed

+6
-9
lines changed

molecule/default/converge.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,9 @@
99
graylog_install_java: False
1010
graylog_not_testing: False
1111
graylog_version: 3.3
12-
graylog_mongodb_version: 4.2
12+
graylog_mongodb_version: 4.4
13+
graylog_mongodb_package_name: mongodb-org
14+
graylog_mongodb_service_name: mongod
1315
graylog_http_bind_address: "{{ hostvars[inventory_hostname]['ansible_default_ipv4']['address'] }}:9000"
1416
graylog_http_publish_uri: "http://{{ hostvars[inventory_hostname]['ansible_default_ipv4']['address'] }}:9000/"
1517
graylog_http_external_uri: "http://{{ hostvars[inventory_hostname]['ansible_default_ipv4']['address'] }}:9000/"

molecule/ui/converge.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,9 @@
1010
graylog_not_testing: False
1111
graylog_version: "{{ lookup('env', 'GRAYLOG_VERSION') | regex_search('^\\d+\\.\\d+') }}"
1212
graylog_full_version: "'{{ lookup('env', 'GRAYLOG_VERSION') }}-{{ lookup('env', 'GRAYLOG_REVISION') }}'"
13-
graylog_mongodb_version: 4.2
13+
graylog_mongodb_version: 4.4
14+
graylog_mongodb_package_name: mongodb-org
15+
graylog_mongodb_service_name: mongod
1416
graylog_http_bind_address: "{{ hostvars[inventory_hostname]['ansible_default_ipv4']['address'] }}:9000"
1517
graylog_http_publish_uri: "http://{{ hostvars[inventory_hostname]['ansible_default_ipv4']['address'] }}:9000/"
1618
graylog_http_external_uri: "http://localhost:9000/"

tasks/mongodb-Debian.yml

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,6 @@
1111
repo: "{{ graylog_mongodb_ubuntu_repo }}"
1212
state: "present"
1313
update_cache: True
14-
15-
- name: Update MongoDB variables (Ubuntu 20.04)
16-
set_fact:
17-
graylog_mongodb_package_name: mongodb
18-
graylog_mongodb_service_name: mongodb
19-
when:
20-
- ansible_distribution_release == 'focal'
2114
when:
2215
- ansible_distribution == 'Ubuntu'
2316

0 commit comments

Comments
 (0)