fix: improved ansile-lint findings

christiangda · Oct 12, 2022 · 538d68a · 538d68a
1 parent 5dd08cf
commit 538d68a
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 8 deletions.
diff --git a/.yamllint b/.yamllint
@@ -14,3 +14,4 @@ ignore: |
   .travis.yml
   .ansible-lint
   .yamllint
+  .github
diff --git a/README.md b/README.md
@@ -44,6 +44,7 @@ This role work on RedHat, CentOS, Amazon Linux, Debian and Ubuntu distributions
   * stream8
 * Rocky Linux
   * 8
+  * 9
 * Amazon Linux
   * 2
 * Ubuntu
@@ -52,6 +53,7 @@ This role work on RedHat, CentOS, Amazon Linux, Debian and Ubuntu distributions
   * 18.*
   * 20.*
   * 21.*
+  * 22.*
 * Debian
   * Stretch (9)
   * buster (10)

diff --git a/meta/main.yml b/meta/main.yml
@@ -30,6 +30,7 @@ galaxy_info:
         - bionic
         - focal
         - impish
+        - jammy
 
   galaxy_tags:
     - aws

diff --git a/tasks/install-redhat.yml b/tasks/install-redhat.yml
@@ -57,7 +57,7 @@
       tags:
         - install
 
-    - name: Install {{ cwa_dependencies_packages }} dependency on {{ansible_distribution}} 6/7/8
+    - name: Install {{ cwa_dependencies_packages }} dependency on {{ ansible_distribution }} 6/7/8/9
       yum:
         name: "{{ cwa_dependencies_packages }}"
         state: present
@@ -71,6 +71,7 @@
           ansible_distribution == 'RedHat' or
           ansible_distribution == 'Rocky'
         ) and (
+          ansible_distribution_major_version == '9' or
           ansible_distribution_major_version == '8' or
           ansible_distribution_major_version == '7' or
           ansible_distribution_major_version == '6'
@@ -95,7 +96,7 @@
   tags:
     - install
 
-- name: Install {{ cwa_package }}.rpm on {{ansible_distribution}} 6/7
+- name: Install {{ cwa_package }}.rpm on {{ ansible_distribution }} 6/7
   yum:
     name: "{{ cwa_temp_path }}/{{ cwa_package }}.rpm"
     disable_gpg_check: true
@@ -117,7 +118,7 @@
   tags:
     - install
 
-- name: Install {{ cwa_package }}.rpm on {{ansible_distribution}} 8
+- name: Install {{ cwa_package }}.rpm on {{ ansible_distribution }} 8/9
   dnf:
     name: "{{ cwa_temp_path }}/{{ cwa_package }}.rpm"
     disable_gpg_check: true
@@ -131,8 +132,10 @@
       ansible_distribution == 'CentOS' or
       ansible_distribution == 'RedHat' or
       ansible_distribution == 'Rocky'
-    ) and
-    ansible_distribution_major_version == '8'
+    ) and (
+      ansible_distribution_major_version == '9' or
+      ansible_distribution_major_version == '8'
+    )
   ignore_errors: "{{ ansible_check_mode }}"
   tags:
     - install
diff --git a/vars/main.yml b/vars/main.yml
@@ -24,11 +24,11 @@ cwa_temp_path: /tmp
 cwa_agent_profile_credentials_file: "{{ cwa_agent_profile_path }}/.aws/credentials"
 
 # Conditional variables
-cwa_use_proxy: "{{ true|bool if cwa_http_proxy is defined and cwa_http_proxy|length > 0 else false|bool }}"
-cwa_use_conf_json_template: "{{ false|bool if cwa_conf_json_file_content is defined and cwa_conf_json_file_content|length > 0 else true|bool }}"
+cwa_use_proxy: "{{ true | bool if cwa_http_proxy is defined and cwa_http_proxy | length > 0 else false | bool }}"
+cwa_use_conf_json_template: "{{ false | bool if cwa_conf_json_file_content is defined and cwa_conf_json_file_content | length > 0 else true | bool }}"
 
 # defined in defaults/main.yaml
-cwa_need_credentials: "{{ true|bool if cwa_agent_mode == 'onPremise' else cwa_use_credentials }}"
+cwa_need_credentials: "{{ true | bool if cwa_agent_mode == 'onPremise' else cwa_use_credentials }}"
 
 cwa_arch_names: {
   "x86_64": "amd64",
-Original file line number
+Diff line change
@@ Expand Up / @@ -30,6 +30,7 @@ galaxy_info: @@
             - bionic
             - focal
             - impish
+            - jammy
       galaxy_tags:
         - aws
@@ Expand Down @@