From 701921fa262273aa6c6c7f248d72e5eb47c5403f Mon Sep 17 00:00:00 2001 From: Jerry Vonau Date: Fri, 28 Aug 2020 19:37:01 -0500 Subject: [PATCH] Revert "use ansible_userspace_architecture for booted 64bit kernels and 32bit userspace" This reverts commit 90eea1a31145c7742cf54f766349ad42e0db0610. --- roles/mongodb/tasks/install.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/roles/mongodb/tasks/install.yml b/roles/mongodb/tasks/install.yml index 95d7a6a79..6fdbc4a34 100644 --- a/roles/mongodb/tasks/install.yml +++ b/roles/mongodb/tasks/install.yml @@ -59,7 +59,7 @@ # end block - when: not (ansible_userspace_architecture == "x86_64" or ansible_userspace_architecture == "aarch64") + when: not (ansible_architecture == "x86_64" or ansible_architecture == "aarch64") # 32 bit OS's get caught above should handle aarch32 including 32-bit ubuntu # from https://ubuntu.com/download/raspberry-pi. 20.4-32bit might fail untested # 32bit intel might puke as this was orginally deployed for raspbian. Haven't @@ -76,7 +76,7 @@ repo: deb http://repo.mongodb.org/apt/debian buster/mongodb-org/4.4 main state: present filename: mongodb-org - when: is_debian_10 and (ansible_userspace_architecture == "x86_64") + 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 @@ -84,7 +84,7 @@ repo: deb [ arch=amd64,arm64 ] https://repo.mongodb.org/apt/ubuntu bionic/mongodb-org/4.4 multiverse state: present filename: mongodb-org - when: (ansible_userspace_architecture == "aarch64" and is_raspbian_10) + when: (ansible_architecture == "aarch64" and is_raspbian_10) - name: Add mongodb repo for Ubuntu 64bit only apt_repository: @@ -108,7 +108,7 @@ line: ' port: 27018' # end block - when: (ansible_userspace_architecture == "aarch64") or (ansible_userspace_architecture == "x86_64") + when: (ansible_architecture == "aarch64") or (ansible_architecture == "x86_64") # 2. CONFIGURE MongoDB FOR IIAB