ansible-lint: removed disabled rules for v6.6.1

.ansible-lint

@@ -4,9 +4,6 @@ use_default_rules: true
 skip_list:
   - name[casing]
   - name[play]
-  - key-order[task]
-  - jinja[spacing]
-  - yaml[comments-indentation]
 
 exclude_paths:
   - .github

changelogs/fragments/280-ansible-lint.yml

@@ -0,0 +1,3 @@
+---
+minor_changes:
+  - "ansible-lint: removed disabled rules for v6.6.1 (#280)"

roles/common/defaults/main.yml

@@ -1,18 +1,18 @@
 # Lab playbook - sets up the host specific shit
 ---
 
-epel_rpm: "{%- if ansible_distribution_major_version | int==6 %}{{ epel6_rpm }}
-           {%- elif ansible_distribution_major_version | int==7 %}{{ epel7_rpm }}
-           {%- elif ansible_distribution_major_version | int==8 %}{{ epel8_rpm }}
-           {%- else %}None
+epel_rpm: "{%- if ansible_distribution_major_version | int == 6 %}{{ epel6_rpm }}\
+           {%- elif ansible_distribution_major_version | int == 7 %}{{ epel7_rpm }}\
+           {%- elif ansible_distribution_major_version | int == 8 %}{{ epel8_rpm }}\
+           {%- else %}None\
            {%- endif %}"
 
 epel8_rpm: https://dl.fedoraproject.org/pub/epel/epel-release-latest-8.noarch.rpm
 epel7_rpm: https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm
 epel6_rpm: https://dl.fedoraproject.org/pub/epel/epel-release-latest-6.noarch.rpm
-ol_repo_file: "{% if ansible_distribution_major_version | int==6%}{{ ol6_repo_file }}
-                 {%- elif ansible_distribution_major_version | int==7 %}{{ ol7_repo_file }}
-                 {%- else %}None
+ol_repo_file: "{% if ansible_distribution_major_version | int == 6 %}{{ ol6_repo_file }}\
+                 {%- elif ansible_distribution_major_version | int == 7 %}{{ ol7_repo_file }}\
+                 {%- else %}None\
                  {%- endif %}"
 ol6_repo_file: public-yum-ol6.repo
 ol7_repo_file: public-yum-ol7.repo
@@ -24,13 +24,14 @@ configure_epel_repo: true
 configure_public_yum_repo: true
 configure_motd: true
 configure_ntp: true
-ntp_type: "{%- if ansible_distribution_major_version | int>=8 %}chrony
-             {%- else %}ntp
+ntp_type: "{% if ansible_distribution_major_version | int >= 8 %}chrony\
+             {%- else %}ntp\
              {%- endif %}"
-common_packages: "{%- if ansible_distribution_major_version | int==6%}{{ common_packages_el6 }}
-                    {%- elif ansible_distribution_major_version | int==7 %}{{ common_packages_el7 }}
-                    {%- elif ansible_distribution_major_version | int==8 %}{{ common_packages_el8 }}
-                    {%- else %}None{% endif %}"
+common_packages: "{% if ansible_distribution_major_version | int == 6 %}{{ common_packages_el6 }}\
+                  {%- elif ansible_distribution_major_version | int == 7 %}{{ common_packages_el7 }}\
+                  {%- elif ansible_distribution_major_version | int == 8 %}{{ common_packages_el8 }}\
+                  {%- else %}None\
+                  {%- endif %}"
 
 common_packages_el6:
   - screen

roles/common/tasks/main.yml

@@ -7,23 +7,22 @@
       - "ansible_version.full is version('2.8', '>=')"
 
 - name: Install EPEL Repo
+  when:
+    - configure_epel_repo
+    - ansible_os_family == 'RedHat'
+  tags:
+    - epelrepo
   block:
     - name: Install GPG Key for EPEL
       ansible.builtin.rpm_key:
         state: present
-        key: https://dl.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-{{ ansible_distribution_major_version  }}
+        key: https://dl.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-{{ ansible_distribution_major_version }}
 
     - name: Add EPEL Repo
       ansible.builtin.yum:
         name: "{{ epel_rpm }}"
         state: installed
 
-  when:
-    - configure_epel_repo
-    - ansible_os_family == 'RedHat'
-  tags:
-    - epelrepo
-
 # Do not use the old public-yum.repo on OL7 after January 2019 anymore
 # Check for /usr/bin/ol_yum_configure.sh in newer systems
 - name: Check for ol_yum_configure.sh

roles/cxoracle/tasks/main.yml

@@ -2,9 +2,9 @@
 ---
 - name: Install cx_oracle
   ansible.builtin.pip:
-     name="{{ cx_oracle_source | default('cx_oracle<8.0') }}"
-     extra_args="{{ extra_args }}"
-     umask={{ cx_oracle_umask | default (omit) }}
-     state=present
+     name: "{{ cx_oracle_source | default('cx_oracle<8.0') }}"
+     extra_args: "{{ extra_args }}"
+     umask: "{{ cx_oracle_umask | default(omit) }}"
+     state: present
   when: install_cx_oracle
   tags: cx_oracle

roles/oraasm_manage_diskgroups/defaults/main.yml

@@ -14,23 +14,23 @@ oracle_env:
 
 oracle_asm_disk_string: ORCL:*
 
-oracle_asm_disk_prefix: "
-    {%- if device_persistence | lower == 'asmlib' -%}
-      {%- if oracle_asm_disk_string.endswith('*') %}{{ oracle_asm_disk_string[:-1] }}
-      {%- else -%}{{ oracle_asm_disk_string }}
-      {%- endif -%}
-    {%- elif device_persistence | lower == 'udev' -%}{{ oracle_asm_disk_string }}
-    {%- else -%}
+oracle_asm_disk_prefix: "\
+    {%- if device_persistence | lower == 'asmlib' -%}\
+      {%- if oracle_asm_disk_string.endswith('*') %}{{ oracle_asm_disk_string[:-1] }}\
+      {%- else -%}{{ oracle_asm_disk_string }}\
+      {%- endif -%}\
+    {%- elif device_persistence | lower == 'udev' -%}{{ oracle_asm_disk_string }}\
+    {%- else -%}\
     {%- endif -%}"
 
-asmdevice_list: "{% if device_persistence | lower == 'asmlib' %}
-                   {%- for disk in item.disk -%}{{ oracle_asm_disk_prefix }}{{ disk.asmlabel | upper }}
-                     {%- if not loop.last -%},{%- endif -%}
-                   {%- endfor %}
-                 {%- elif device_persistence | lower == 'udev' %}
-                   {%- for disk in item.disk -%}{{ oracle_asm_disk_prefix }}{{ disk.asmlabel }}
-                     {%- if not loop.last -%},{%- endif -%}
-                   {%- endfor %}
+asmdevice_list: "{% if device_persistence | lower == 'asmlib' %}\
+                   {%- for disk in item.disk -%}{{ oracle_asm_disk_prefix }}{{ disk.asmlabel | upper }}\
+                     {%- if not loop.last -%},{%- endif -%}\
+                   {%- endfor %}\
+                 {%- elif device_persistence | lower == 'udev' %}\
+                   {%- for disk in item.disk -%}{{ oracle_asm_disk_prefix }}{{ disk.asmlabel }}\
+                     {%- if not loop.last -%},{%- endif -%}\
+                   {%- endfor %}\
                  {%- endif %}"
-attr_name: "{% if item.attributes is defined %}{{ item.attributes | default (omit) | map(attribute='name') | list }}{% else %}None{%endif%}"
-attr_value: "{% if item.attributes is defined %}{{ item.attributes | default (omit) | map(attribute='value') | list }}{% else %}None{%endif%}"
+attr_name: "{% if item.attributes is defined %}{{ item.attributes | default(omit) | map(attribute='name') | list }}{% else %}None{% endif %}"
+attr_value: "{% if item.attributes is defined %}{{ item.attributes | default(omit) | map(attribute='value') | list }}{% else %}None{% endif %}"

roles/oraasm_manage_diskgroups/tasks/main.yml

@@ -2,18 +2,18 @@
 # tasks file for asm-diskgroups
 
 - name: oraasm_manage_diskgroups | Manage diskgroups
-  oracle_asmdg:
-    un=sys
-    pw={{ sysasmpassword }}
-    sn=+ASM
-    host={{ ansible_hostname }}
-    oh={{ oracle_home_gi }}
-    name={{ item.diskgroup }}
-    disks={{ asmdevice_list }}
-    redundancy={{ item.redundancy | default(omit) }}
-    attribute_name={{ attr_name  | default (omit) }}
-    attribute_value={{ attr_value | default (omit) }}
-    state={{ item.state }}
+  opitzconsulting.ansible_oracle.oracle_asmdg:
+    un: sys
+    pw: "{{ sysasmpassword }}"
+    sn: +ASM
+    host: "{{ ansible_hostname }}"
+    oh: "{{ oracle_home_gi }}"
+    name: "{{ item.diskgroup }}"
+    disks: "{{ asmdevice_list }}"
+    redundancy: "{{ item.redundancy | default(omit) }}"
+    attribute_name: "{{ attr_name | default(omit) }}"
+    attribute_value: "{{ attr_value | default(omit) }}"
+    state: "{{ item.state }}"
   environment: "{{ oracle_env }}"
   run_once: "{{ configure_cluster }}"
   become_user: "{{ grid_install_user }}"

roles/oradb_datapatch/defaults/main.yml

@@ -3,23 +3,23 @@ hostgroup: "{{ group_names[0] }}"
 oracle_user: oracle
 
 db_user: sys
-db_password: "{% if dbpasswords is defined and dbpasswords[item.oracle_db_name] is defined and dbpasswords[item.oracle_db_name][db_user] is defined%}{{ dbpasswords[item.oracle_db_name][db_user] }}
-              {%- else %}{{ default_dbpass }}
+db_password: "{% if dbpasswords is defined and dbpasswords[item.oracle_db_name] is defined and dbpasswords[item.oracle_db_name][db_user] is defined %}{{ dbpasswords[item.oracle_db_name][db_user] }}\
+              {%- else %}{{ default_dbpass }}\
               {%- endif %}"
 
-db_service_name: "{%- if item.oracle_db_unique_name is defined -%}
-                       {{ item.oracle_db_unique_name }}
-                  {%- else -%}
-                       {{ item.oracle_db_name }}
+db_service_name: "{%- if item.oracle_db_unique_name is defined -%}\
+                       {{ item.oracle_db_unique_name }}\
+                  {%- else -%}\
+                       {{ item.oracle_db_name }}\
                   {%- endif -%}"
 
 listener_port_template: "{% if item.listener_port is defined %}{{ item.listener_port }}{% else %}{{ listener_port }}{% endif %}"
 listener_port: 1521
 
-listener_home: "{%- if lsnrinst is defined -%}
-                  {%- if db_homes_config[lsnrinst.home]['oracle_home'] is defined -%}{{ db_homes_config[lsnrinst.home]['oracle_home'] }}
-                  {%- else -%}{{ oracle_base }}/{{ db_homes_config[lsnrinst.home]['version'] }}/{{ db_homes_config[lsnrinst.home]['home'] }}
-                  {%- endif -%}
+listener_home: "{%- if lsnrinst is defined -%}\
+                  {%- if db_homes_config[lsnrinst.home]['oracle_home'] is defined -%}{{ db_homes_config[lsnrinst.home]['oracle_home'] }}\
+                  {%- else -%}{{ oracle_base }}/{{ db_homes_config[lsnrinst.home]['version'] }}/{{ db_homes_config[lsnrinst.home]['home'] }}\
+                  {%- endif -%}\
                 {%- endif -%}"
 
 oracle_env:
@@ -35,10 +35,10 @@ oracle_env_lsnrctl:
 autostartup_service: false
 fail_on_db_not_exist: false
 
-oracle_db_home: "{%- if item is defined -%}
-                    {%- if db_homes_config[item.home]['oracle_home'] is defined -%}
-                         {{ db_homes_config[item.home]['oracle_home'] }}
-                    {%- else -%}
-                         {{ oracle_base }}/{{ db_homes_config[item.home]['version'] }}/{{ db_homes_config[item.home]['home'] }}
-                    {%- endif -%}
+oracle_db_home: "{%- if item is defined -%}\
+                    {%- if db_homes_config[item.home]['oracle_home'] is defined -%}\
+                         {{ db_homes_config[item.home]['oracle_home'] }}\
+                    {%- else -%}\
+                         {{ oracle_base }}/{{ db_homes_config[item.home]['version'] }}/{{ db_homes_config[item.home]['home'] }}\
+                    {%- endif -%}\
                  {%- endif -%}"

roles/oradb_datapatch/tasks/main.yml

@@ -7,10 +7,12 @@
   loop_control:
     loop_var: lsnrinst
     label: "LISTENER: {{ lsnrinst.listener_name }} ORACLE_HOME: {{ listener_home }}"
-  when: listener_installed is defined and lsnrinst.state|lower == 'present'
+  when:
+    - listener_installed is defined
+    - lsnrinst.state | lower == 'present'
 
 - name: oradb_datapatch | Start database
-  oracle_db:
+  opitzconsulting.ansible_oracle.oracle_db:
     oracle_home: "{{ oracle_db_home }}"
     db_name: "{{ item.oracle_db_name }}"
     db_unique_name: "{{ item.oracle_db_unique_name | default(omit) }}"
@@ -23,7 +25,7 @@
   tags: startdb
 
 - name: oradb_datapatch | Run datapatch
-  oracle_datapatch:
+  opitzconsulting.ansible_oracle.oracle_datapatch:
     oracle_home: "{{ oracle_db_home }}"
     db_name: "{{ item.oracle_db_name }}"
     db_unique_name: "{{ item.oracle_db_unique_name | default(omit) }}"

roles/oradb_manage_db/defaults/main.yml

@@ -23,26 +23,26 @@ oracle_dbf_dir_fs: /u01/oradata/                                # If storage_typ
 oracle_reco_dir_fs: /u01/fra/                                   # If storage_type=FS this is where the fast recovery area is placed.
 oracle_dbf_dir_asm: '+DATA'                                        # If storage_type=ASM this is where the database is placed.
 oracle_reco_dir_asm: '+FRA'                                        # If storage_type=ASM this is where the fast recovery area is placed
-datafile_dest: "{% if dbh.storage_type | upper == 'FS' %}{{ oracle_dbf_dir_fs }}
-                {%- elif dbh.storage_type | upper == 'ASM' %}{{ oracle_dbf_dir_asm }}
+datafile_dest: "{% if dbh.storage_type | upper == 'FS' %}{{ oracle_dbf_dir_fs }}\
+                {%- elif dbh.storage_type | upper == 'ASM' %}{{ oracle_dbf_dir_asm }}\
                 {%- endif %}"
-recoveryfile_dest: "{% if dbh.storage_type | upper == 'FS' %}{{ oracle_reco_dir_fs }}
-                    {%- elif dbh.storage_type | upper == 'ASM' %}{{ oracle_reco_dir_asm }}
+recoveryfile_dest: "{% if dbh.storage_type | upper == 'FS' %}{{ oracle_reco_dir_fs }}\
+                    {%- elif dbh.storage_type | upper == 'ASM' %}{{ oracle_reco_dir_asm }}\
                     {%- endif %}"
 
 configure_cluster: false
 # oracle_install_option_gi: "none"
 oracle_gi_cluster_type: STANDARD
 hostgroup_hub: "{{ hostgroup }}-hub"
 hostgroup_leaf: "{{ hostgroup }}-leaf"
-create_listener: "{%- if oracle_install_option_gi is defined -%}
-                      False
-                  {%- elif oracle_install_option_gi is undefined -%}
-                        {%- if dbh is defined and dbh.listener_name is defined -%}
-                            True
-                        {%- else -%}
-                            False
-                        {%- endif -%}
+create_listener: "{%- if oracle_install_option_gi is defined -%}\
+                      False\
+                  {%- elif oracle_install_option_gi is undefined -%}\
+                        {%- if dbh is defined and dbh.listener_name is defined -%}\
+                            True\
+                        {%- else -%}\
+                            False\
+                        {%- endif -%}\
                     {%- endif -%}"
 
 listener_name_template: "{% if dbh is defined and dbh.listener_name is defined %}{{ dbh.listener_name }}{% else %}{{ listener_name }}{% endif %}"
@@ -52,18 +52,18 @@ listener_name: LISTENER
 listener_protocols: TCP
 listener_port: 1521
 
-listener_home: "{%- if lsnrinst is defined -%}
-                  {%- if db_homes_config[lsnrinst.home]['oracle_home'] is defined -%}{{ db_homes_config[lsnrinst.home]['oracle_home'] }}
-                  {%- else -%}{{ oracle_base }}/{{ db_homes_config[lsnrinst.home]['version'] }}/{{ db_homes_config[lsnrinst.home]['home'] }}
-                  {%- endif -%}
-                {%- elif tnsinst is defined -%}
-                  {%- if db_homes_config[tnsinst.home]['oracle_home'] is defined -%}{{ db_homes_config[tnsinst.home]['oracle_home'] }}
-                  {%- else -%}{{ oracle_base }}/{{ db_homes_config[tnsinst.home]['version'] }}/{{ db_homes_config[tnsinst.home]['home'] }}
-                  {%- endif -%}
-                {%- elif sqlnetinst is defined -%}
-                  {%- if db_homes_config[sqlnetinst.home]['oracle_home'] is defined -%}{{ db_homes_config[sqlnetinst.home]['oracle_home'] }}
-                  {%- else -%}{{ oracle_base }}/{{ db_homes_config[sqlnetinst.home]['version'] }}/{{ db_homes_config[sqlnetinst.home]['home'] }}
-                  {%- endif -%}
+listener_home: "{%- if lsnrinst is defined -%}\
+                  {%- if db_homes_config[lsnrinst.home]['oracle_home'] is defined -%}{{ db_homes_config[lsnrinst.home]['oracle_home'] }}\
+                  {%- else -%}{{ oracle_base }}/{{ db_homes_config[lsnrinst.home]['version'] }}/{{ db_homes_config[lsnrinst.home]['home'] }}\
+                  {%- endif -%}\
+                {%- elif tnsinst is defined -%}\
+                  {%- if db_homes_config[tnsinst.home]['oracle_home'] is defined -%}{{ db_homes_config[tnsinst.home]['oracle_home'] }}\
+                  {%- else -%}{{ oracle_base }}/{{ db_homes_config[tnsinst.home]['version'] }}/{{ db_homes_config[tnsinst.home]['home'] }}\
+                  {%- endif -%}\
+                {%- elif sqlnetinst is defined -%}\
+                  {%- if db_homes_config[sqlnetinst.home]['oracle_home'] is defined -%}{{ db_homes_config[sqlnetinst.home]['oracle_home'] }}\
+                  {%- else -%}{{ oracle_base }}/{{ db_homes_config[sqlnetinst.home]['version'] }}/{{ db_homes_config[sqlnetinst.home]['home'] }}\
+                  {%- endif -%}\
                 {%- endif -%}"
 
 oracle_env_lsnrctl:
@@ -81,34 +81,34 @@ autostartup_service: false
 
 ## START-OF-PASSWORDS
 # GI
-default_gipass: "{% if oracle_password is defined %}{{ oracle_password }}
-                 {%- else %}Oracle123{% endif%}"  # The check for the old passwords are there for backwards compatibility and only temporary, will be removed
-sysasmpassword: "{% if oracle_password is defined %}{{ oracle_password }}
-                 {%- else %}Oracle123{% endif%}"  # The check for the old passwords are there for backwards compatibility and only temporary, will be removed
-asmmonitorpassword: "{% if oracle_password is defined %}{{ oracle_password }}
-                     {%- else %}Oracle123
+default_gipass: "{% if oracle_password is defined %}{{ oracle_password }}\
+                 {%- else %}Oracle123{% endif %}"  # The check for the old passwords are there for backwards compatibility and only temporary, will be removed
+sysasmpassword: "{% if oracle_password is defined %}{{ oracle_password }}\
+                 {%- else %}Oracle123{% endif %}"  # The check for the old passwords are there for backwards compatibility and only temporary, will be removed
+asmmonitorpassword: "{% if oracle_password is defined %}{{ oracle_password }}\
+                     {%- else %}Oracle123\
                      {%- endif %}"  # The check for the old passwords are there for backwards compatibility and only temporary, will be removed
 
 dbca_templatename: General_Purpose.dbc
-dbca_sys_pass: "{% if dbpasswords[dbh.oracle_db_name] is defined %}
-                  {%- if dbpasswords[dbh.oracle_db_name]['sys'] is defined %}{{ dbpasswords[dbh.oracle_db_name]['sys'] }}
-                  {%- else %}{{ default_dbpass }}
-                  {%- endif %}
-                {%- else %}{{ default_dbpass }}
+dbca_sys_pass: "{% if dbpasswords[dbh.oracle_db_name] is defined %}\
+                  {%- if dbpasswords[dbh.oracle_db_name]['sys'] is defined %}{{ dbpasswords[dbh.oracle_db_name]['sys'] }}\
+                  {%- else %}{{ default_dbpass }}\
+                  {%- endif %}\
+                {%- else %}{{ default_dbpass }}\
                 {%- endif %}"
-dbca_system_pass: "{% if dbpasswords[dbh.oracle_db_name] is defined %}
-                     {%- if dbpasswords[dbh.oracle_db_name]['system'] is defined %}{{ dbpasswords[dbh.oracle_db_name]['system'] }}
-                     {%- else %}{{ default_dbpass }}
-                     {%- endif %}
-                    {%- else %}{{ default_dbpass }}
+dbca_system_pass: "{% if dbpasswords[dbh.oracle_db_name] is defined %}\
+                     {%- if dbpasswords[dbh.oracle_db_name]['system'] is defined %}{{ dbpasswords[dbh.oracle_db_name]['system'] }}\
+                     {%- else %}{{ default_dbpass }}\
+                     {%- endif %}\
+                    {%- else %}{{ default_dbpass }}\
                     {%- endif %}"
 
-init_params_list: "{%- if dbh.init_parameters is defined  -%}
-                      {%- for p in  dbh.init_parameters -%}
-                        {%- if p.dbca | default(True) -%}
-                            {{ p.name }}={{ p.value }}{%- if not loop.last -%},{%- endif -%}
-                        {%- endif -%}
-                      {%- endfor -%}
+init_params_list: "{%- if dbh.init_parameters is defined -%}\
+                      {%- for p in dbh.init_parameters -%}\
+                        {%- if p.dbca | default(True) -%}\
+                            {{ p.name }}={{ p.value }}{%- if not loop.last -%},{%- endif -%}\
+                        {%- endif -%}\
+                      {%- endfor -%}\
                     {%- endif -%}"
 
 shell_ps1: "'[$LOGNAME'@'$ORACLE_SID `basename $PWD`]$'"