Merge pull request #1561 from guardian/aa/simplify-aws-tools

feat(aws-tools)!: Remove support for RedHat
guardian · Oct 7, 2024 · 28f4a6c · 28f4a6c
2 parents fb5cdfd + 103ab40
commit 28f4a6c
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 21 deletions.
diff --git a/roles/aws-tools/tasks/install-pip-aws-cli-Debian.yml b/roles/aws-tools/tasks/install-pip-aws-cli-Debian.yml
diff --git a/roles/aws-tools/tasks/install-pip-aws-cli-RedHat.yml b/roles/aws-tools/tasks/install-pip-aws-cli-RedHat.yml
diff --git a/roles/aws-tools/tasks/main.yml b/roles/aws-tools/tasks/main.yml
@@ -1,17 +1,17 @@
 ---
 - name: See what Ubuntu version we're running
-  set_fact: 
+  set_fact:
     post_focal: "{{ 'post-focal' if ( ansible_distribution_major_version|int >= 20 ) else 'older' }}"
 
-- name: Install pip and the latest AWS CLI
-  include: "{{ item }}"
-  with_first_found:
-    - "install-pip-aws-cli-{{ ansible_os_family }}.yml"
+- name: Install pip3
+  apt: name=python3-pip state=present
+
+- name: Install latest AWS CLI
+  command: pip3 install awscli
 
 - name: Install cloudformation tools
   include: "{{ item }}"
   with_first_found:
     - "install-cfn-tools-{{ ansible_distribution }}-{{ post_focal }}.yml"
     - "install-cfn-tools-{{ ansible_os_family }}.yml"
     - "install-cfn-tools.yml"
-