From 1bea516feaa4976c1848370f50015f6c7952ed37 Mon Sep 17 00:00:00 2001
From: Jerry Vonau <jvonau3@gmail.com>
Date: Tue, 1 Sep 2020 05:13:20 -0500
Subject: [PATCH 1/2] Mint might need static mapping to Ubuntu

---
 roles/mongodb/tasks/install.yml | 9 ++++++++-
 vars/default_vars.yml           | 4 ++++
 vars/linuxmint-20.yml           | 3 +++
 3 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/roles/mongodb/tasks/install.yml b/roles/mongodb/tasks/install.yml
index 6fdbc4a34..08537680f 100644
--- a/roles/mongodb/tasks/install.yml
+++ b/roles/mongodb/tasks/install.yml
@@ -91,7 +91,14 @@
       repo: deb [ arch=amd64,arm64 ] https://repo.mongodb.org/apt/ubuntu {{ ansible_distribution_release }}/mongodb-org/4.4 multiverse
       state: present
       filename: mongodb-org
-    when: is_ubuntu
+    when: is_ubuntu and not is_mint
+
+  - name: Add mongodb repo for Mint 64bit only
+    apt_repository:
+      repo: deb [ arch=amd64,arm64 ] https://repo.mongodb.org/apt/ubuntu focal/mongodb-org/4.4 multiverse
+      state: present
+      filename: mongodb-org
+    when: is_mint_20
 
   - name: "Install packages: mongodb-org, mongodb-org-server"
     package:
diff --git a/vars/default_vars.yml b/vars/default_vars.yml
index d731c05e9..d02498f39 100644
--- a/vars/default_vars.yml
+++ b/vars/default_vars.yml
@@ -704,6 +704,10 @@ is_ubuntu_18: False
 is_ubuntu_17: False
 is_ubuntu_16: False
 
+is_mint: False       # subset of is_ubuntu
+is_mint_20: False
+
+
 is_debian: False    # Covers both: Debian, Raspbian (Raspberry Pi OS)
 is_debian_10: False
 is_debian_9: False
diff --git a/vars/linuxmint-20.yml b/vars/linuxmint-20.yml
index f58ba79ed..5ed252e7d 100644
--- a/vars/linuxmint-20.yml
+++ b/vars/linuxmint-20.yml
@@ -1,6 +1,9 @@
 is_debuntu: True
 is_ubuntu: True
 is_ubuntu_20: True
+is_mint: True
+is_mint_20: True
+
 
 # 2019-03-23: These apply if-only-if named_install and/or dhcpd_install are True
 # (This is quite rare now that vars/default_vars.yml sets dnsmasq_install: True)

From 287307fb98acbad1a542ffe659bfe3ad5fabbc68 Mon Sep 17 00:00:00 2001
From: Jerry Vonau <jvonau3@gmail.com>
Date: Tue, 1 Sep 2020 06:00:32 -0500
Subject: [PATCH 2/2] wording and ordering

---
 roles/mongodb/tasks/install.yml | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/roles/mongodb/tasks/install.yml b/roles/mongodb/tasks/install.yml
index 08537680f..0e07ca746 100644
--- a/roles/mongodb/tasks/install.yml
+++ b/roles/mongodb/tasks/install.yml
@@ -71,7 +71,7 @@
     args:
       warn: false
 
-  - name: Add mongodb repo for Debian 10 (only amd64 support available)
+  - name: Use mongodb-org's Debian buster repo for Debian 10 (only amd64 support available)
     apt_repository:
       repo: deb http://repo.mongodb.org/apt/debian buster/mongodb-org/4.4 main
       state: present
@@ -79,27 +79,27 @@
     when: is_debian_10 and (ansible_architecture == "x86_64")
 
   # Debian 10 aarch64 might work below but is blocked in main.yml
-  - name: Add mongodb repo for RaspOS-aarch64
+  - name: Use mongodb-org's Ubuntu bionic repo for RaspOS-aarch64
     apt_repository:
       repo: deb [ arch=amd64,arm64 ] https://repo.mongodb.org/apt/ubuntu bionic/mongodb-org/4.4 multiverse
       state: present
       filename: mongodb-org
     when: (ansible_architecture == "aarch64" and is_raspbian_10)
 
-  - name: Add mongodb repo for Ubuntu 64bit only
-    apt_repository:
-      repo: deb [ arch=amd64,arm64 ] https://repo.mongodb.org/apt/ubuntu {{ ansible_distribution_release }}/mongodb-org/4.4 multiverse
-      state: present
-      filename: mongodb-org
-    when: is_ubuntu and not is_mint
-
-  - name: Add mongodb repo for Mint 64bit only
+  - name: Use mongodb-org's Ubuntu focal repo for Mint 20 - 64bit only
     apt_repository:
       repo: deb [ arch=amd64,arm64 ] https://repo.mongodb.org/apt/ubuntu focal/mongodb-org/4.4 multiverse
       state: present
       filename: mongodb-org
     when: is_mint_20
 
+  - name: Use mongodb-org's Ubuntu repo for Ubuntu all -  64bit only
+    apt_repository:
+      repo: deb [ arch=amd64,arm64 ] https://repo.mongodb.org/apt/ubuntu {{ ansible_distribution_release }}/mongodb-org/4.4 multiverse
+      state: present
+      filename: mongodb-org
+    when: is_ubuntu and not is_mint
+
   - name: "Install packages: mongodb-org, mongodb-org-server"
     package:
       name: