fix for ubuntu 2204 apt key deprecated - ansible/ansible#78063

tonyclemmey · Oct 2, 2022 · ca676ed · ca676ed
1 parent e467181
commit ca676ed
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 14 deletions.
diff --git a/tasks/install.debian.yml b/tasks/install.debian.yml
@@ -9,23 +9,22 @@
     - mongodb_disable_transparent_hugepages | bool
     - ansible_service_mgr == "systemd"
 
+# ORIGINAL
 # - name: Add APT key
 #   apt_key:
 #     keyserver: "{{ mongodb_apt_keyserver if not mongodb_apt_key_from_url|bool else omit }}"
 #     url: "{{ mongodb_apt_key_url[mongodb_major_version] if mongodb_apt_key_from_url|bool else omit }}"
 #     id: "{{ mongodb_apt_key_id[mongodb_major_version] }}"
 #   when: mongodb_package == 'mongodb-org'
 
-# Fix for Ubuntu 22.04
-# - name: Add APT key (new GPG method)
-#   get_url:
-#     url: "{{ mongodb_apt_key_url[mongodb_major_version] if mongodb_apt_key_from_url|bool else omit }}"
-#     dest: "/usr/share/keyrings/mongodb-{{ mongodb_version }}-key.asc"
-#   when: mongodb_package == 'mongodb-org'
-
+# FIX for Ubuntu 22.04+
 - name: Add APT key (new GPG method)
-  become: true
-  shell: "wget -O mongodb-{{ mongodb_version }}-key.asc {{ mongodb_apt_key_url[mongodb_major_version] if mongodb_apt_key_from_url|bool else omit }};cat mongodb-{{ mongodb_version }}-key.asc | gpg --dearmor | sudo tee /usr/share/keyrings/mongodb-{{ mongodb_version }}-key.gpg > /dev/null 2>&1"
+  get_url:
+    url: "{{ mongodb_apt_key_url[mongodb_major_version] if mongodb_apt_key_from_url|bool else omit }}"
+    dest: "/usr/share/keyrings/mongodb-{{ mongodb_version }}-key.asc"
+    mode: '0644'
+    force: true
+  when: mongodb_package == 'mongodb-org'
 
 - name: Fail when used wrong mongodb_version variable
   fail:

diff --git a/vars/Ubuntu.yml b/vars/Ubuntu.yml
@@ -1,10 +1,10 @@
 ---
 mongodb_repository:
-  "3.6": "deb [signed-by=/usr/share/keyrings/mongodb-{{ mongodb_version }}-key.gpg] http://repo.mongodb.org/apt/ubuntu {{ ansible_distribution_release }}/mongodb-org/3.6 multiverse"
-  "4.0": "deb [signed-by=/usr/share/keyrings/mongodb-{{ mongodb_version }}-key.gpg] http://repo.mongodb.org/apt/ubuntu {{ ansible_distribution_release }}/mongodb-org/4.0 multiverse"
-  "4.2": "deb [signed-by=/usr/share/keyrings/mongodb-{{ mongodb_version }}-key.gpg] http://repo.mongodb.org/apt/ubuntu {{ ansible_distribution_release }}/mongodb-org/4.2 multiverse"
-  "4.4": "deb [signed-by=/usr/share/keyrings/mongodb-{{ mongodb_version }}-key.gpg] http://repo.mongodb.org/apt/ubuntu {{ ansible_distribution_release }}/mongodb-org/4.4 multiverse"
-  "5.0": "deb [signed-by=/usr/share/keyrings/mongodb-{{ mongodb_version }}-key.gpg] http://repo.mongodb.org/apt/ubuntu {{ ansible_distribution_release }}/mongodb-org/5.0 multiverse"
+  "3.6": "deb [signed-by=/usr/share/keyrings/mongodb-{{ mongodb_version }}-key.asc] http://repo.mongodb.org/apt/ubuntu {{ ansible_distribution_release }}/mongodb-org/3.6 multiverse"
+  "4.0": "deb [signed-by=/usr/share/keyrings/mongodb-{{ mongodb_version }}-key.asc] http://repo.mongodb.org/apt/ubuntu {{ ansible_distribution_release }}/mongodb-org/4.0 multiverse"
+  "4.2": "deb [signed-by=/usr/share/keyrings/mongodb-{{ mongodb_version }}-key.asc] http://repo.mongodb.org/apt/ubuntu {{ ansible_distribution_release }}/mongodb-org/4.2 multiverse"
+  "4.4": "deb [signed-by=/usr/share/keyrings/mongodb-{{ mongodb_version }}-key.asc] http://repo.mongodb.org/apt/ubuntu {{ ansible_distribution_release }}/mongodb-org/4.4 multiverse"
+  "5.0": "deb [signed-by=/usr/share/keyrings/mongodb-{{ mongodb_version }}-key.asc] http://repo.mongodb.org/apt/ubuntu {{ ansible_distribution_release }}/mongodb-org/5.0 multiverse"
 
 mongodb_pymongo_package: "{{ 'python3-pymongo' if ansible_facts['python'].version.major == 3 else 'python-pymongo' }}"
 mongodb_pymongo_deps: