From f942bd9df77154b560183abfc5f85d8d0e099454 Mon Sep 17 00:00:00 2001 From: Ryan Lerch Date: Wed, 13 Nov 2024 18:16:57 +1000 Subject: [PATCH] [ansible-lint] Avoid using free-form when calling module actions. Signed-off-by: Ryan Lerch --- playbooks/openshift-apps/application-monitoring.yml | 3 ++- playbooks/openshift-apps/blockerbugs.yml | 4 +++- playbooks/openshift-apps/bodhi.yml | 4 +++- playbooks/openshift-apps/coreos-cincinnati.yml | 4 +++- playbooks/openshift-apps/kanban.yml | 4 +++- playbooks/openshift-apps/kerneltest.yml | 4 +++- playbooks/openshift-apps/koschei.yml | 9 ++++++--- playbooks/openshift-apps/openscanhub.yml | 4 +++- playbooks/openshift-apps/oraculum.yml | 4 +++- playbooks/openshift-apps/testdays.yml | 4 +++- 10 files changed, 32 insertions(+), 12 deletions(-) diff --git a/playbooks/openshift-apps/application-monitoring.yml b/playbooks/openshift-apps/application-monitoring.yml index bfa7bd5779..426bf0f5ae 100644 --- a/playbooks/openshift-apps/application-monitoring.yml +++ b/playbooks/openshift-apps/application-monitoring.yml @@ -28,7 +28,8 @@ ansible.builtin.command: oc adm pod-network make-projects-global application-monitoring - name: Copy files - ansible.builtin.copy: src={{ roles_path }}/openshift-apps/application-monitoring/files/ dest=/etc/openshift_apps/application-monitoring/ + ansible.builtin.copy: + src: "{{ roles_path }}/openshift-apps/application-monitoring/files/ dest=/etc/openshift_apps/application-monitoring/" - name: Prometheus CRDs ansible.builtin.command: oc -n application-monitoring apply -f /etc/openshift_apps/application-monitoring/prometheus-operator/example/prometheus-operator-crd/ diff --git a/playbooks/openshift-apps/blockerbugs.yml b/playbooks/openshift-apps/blockerbugs.yml index adb76daf67..c36ee4bdde 100644 --- a/playbooks/openshift-apps/blockerbugs.yml +++ b/playbooks/openshift-apps/blockerbugs.yml @@ -5,7 +5,9 @@ tasks: - name: Install psycopg2 for the postgresql ansible modules - ansible.builtin.package: name=python3-psycopg2 state=present + ansible.builtin.package: + name: python3-psycopg2 + state: present tags: - packages diff --git a/playbooks/openshift-apps/bodhi.yml b/playbooks/openshift-apps/bodhi.yml index 86f95c2590..55ce340909 100644 --- a/playbooks/openshift-apps/bodhi.yml +++ b/playbooks/openshift-apps/bodhi.yml @@ -20,7 +20,9 @@ pre_tasks: - name: Include Global Variables - ansible.builtin.include_vars: dir=/srv/web/infra/ansible/vars/all/ ignore_files=README + ansible.builtin.include_vars: + dir: /srv/web/infra/ansible/vars/all/ + ignore_files: README - name: Include Bodhi Variables ansible.builtin.include_vars: /srv/web/infra/ansible/vars/apps/bodhi.yml - name: Set bodhi_version fact diff --git a/playbooks/openshift-apps/coreos-cincinnati.yml b/playbooks/openshift-apps/coreos-cincinnati.yml index 976e2a3c21..7b8b7b55a9 100644 --- a/playbooks/openshift-apps/coreos-cincinnati.yml +++ b/playbooks/openshift-apps/coreos-cincinnati.yml @@ -12,7 +12,9 @@ pre_tasks: - name: Include Global Variables - ansible.builtin.include_vars: dir=/srv/web/infra/ansible/vars/all/ ignore_files=README + ansible.builtin.include_vars: + dir: /srv/web/infra/ansible/vars/all/ + ignore_files: README ############################################ # actions to create the project in OpenShift diff --git a/playbooks/openshift-apps/kanban.yml b/playbooks/openshift-apps/kanban.yml index b76231765b..ad728f715c 100644 --- a/playbooks/openshift-apps/kanban.yml +++ b/playbooks/openshift-apps/kanban.yml @@ -5,7 +5,9 @@ tasks: - name: Install psycopg2 for the postgresql ansible modules - ansible.builtin.package: name=python3-psycopg2 state=present + ansible.builtin.package: + name: python3-psycopg2 + state: present tags: - packages diff --git a/playbooks/openshift-apps/kerneltest.yml b/playbooks/openshift-apps/kerneltest.yml index a6b7f34fb1..73b41a071d 100644 --- a/playbooks/openshift-apps/kerneltest.yml +++ b/playbooks/openshift-apps/kerneltest.yml @@ -32,7 +32,9 @@ pre_tasks: - name: Include Global Variables - ansible.builtin.include_vars: dir=/srv/web/infra/ansible/vars/all/ ignore_files=README + ansible.builtin.include_vars: + dir: /srv/web/infra/ansible/vars/all/ + ignore_files: README roles: diff --git a/playbooks/openshift-apps/koschei.yml b/playbooks/openshift-apps/koschei.yml index 5ef579eda8..a5cf407b33 100644 --- a/playbooks/openshift-apps/koschei.yml +++ b/playbooks/openshift-apps/koschei.yml @@ -37,7 +37,8 @@ tasks: - name: Apply objects - ansible.builtin.include_role: name=openshift/object + ansible.builtin.include_role: + name: openshift/object vars: template: "{{ item }}.yml" objectname: "{{ item }}.yml" @@ -51,7 +52,8 @@ - frontend-service - name: Apply Deployment - ansible.builtin.include_role: name=openshift/object + ansible.builtin.include_role: + name: openshift/object vars: template: backend-deployment.yml objectname: "{{ item.name }}-deployment.yml" @@ -65,7 +67,8 @@ label: "{{ item.name }}" - name: Apply CronJob - ansible.builtin.include_role: name=openshift/object + ansible.builtin.include_role: + name: openshift/object vars: template: cronjob.yml objectname: "{{ item.name }}-cronjob.yml" diff --git a/playbooks/openshift-apps/openscanhub.yml b/playbooks/openshift-apps/openscanhub.yml index 3383db353f..3eb32c49ea 100644 --- a/playbooks/openshift-apps/openscanhub.yml +++ b/playbooks/openshift-apps/openscanhub.yml @@ -14,7 +14,9 @@ pre_tasks: - name: Include Global Variables - ansible.builtin.include_vars: dir=/srv/web/infra/ansible/vars/all/ ignore_files=README + ansible.builtin.include_vars: + dir: /srv/web/infra/ansible/vars/all/ + ignore_files: README roles: - role: openshift/project diff --git a/playbooks/openshift-apps/oraculum.yml b/playbooks/openshift-apps/oraculum.yml index 542b3c3c62..b2acd23aed 100644 --- a/playbooks/openshift-apps/oraculum.yml +++ b/playbooks/openshift-apps/oraculum.yml @@ -5,7 +5,9 @@ tasks: - name: Install psycopg2 for the postgresql ansible modules - ansible.builtin.package: name=python3-psycopg2 state=present + ansible.builtin.package: + name: python3-psycopg2 + state: present tags: - packages diff --git a/playbooks/openshift-apps/testdays.yml b/playbooks/openshift-apps/testdays.yml index 1f08105730..06c71f400f 100644 --- a/playbooks/openshift-apps/testdays.yml +++ b/playbooks/openshift-apps/testdays.yml @@ -5,7 +5,9 @@ tasks: - name: Install psycopg2 for the postgresql ansible modules - ansible.builtin.package: name=python3-psycopg2 state=present + ansible.builtin.package: + name: python3-psycopg2 + state: present tags: - packages