mirror of
https://github.com/freeipa/ansible-freeipa.git
synced 2026-07-31 11:54:47 +00:00
roles: Fix ansible-lint name:template warnings
ansible-lint warns if Jinja2 templates are not used as the last item in a task name.
This commit is contained in:
@@ -217,7 +217,7 @@
|
|||||||
and ipaadmin_keytab is undefined
|
and ipaadmin_keytab is undefined
|
||||||
and ipaclient_keytab is undefined
|
and ipaclient_keytab is undefined
|
||||||
|
|
||||||
- name: Install - Purge {{ result_ipaclient_test.realm }} from host keytab
|
- name: "Install - From host keytab, purge {{ result_ipaclient_test.realm }}"
|
||||||
ansible.builtin.command: >
|
ansible.builtin.command: >
|
||||||
/usr/sbin/ipa-rmkeytab
|
/usr/sbin/ipa-rmkeytab
|
||||||
-k /etc/krb5.keytab
|
-k /etc/krb5.keytab
|
||||||
|
|||||||
@@ -1,14 +1,18 @@
|
|||||||
---
|
---
|
||||||
- name: Install - Initialize ipaserver_external_cert_files
|
- name: Copy external certificates
|
||||||
ansible.builtin.set_fact:
|
vars:
|
||||||
ipaserver_external_cert_files: []
|
__item_basename: "{{ item | basename }}"
|
||||||
when: ipaserver_external_cert_files is undefined
|
block:
|
||||||
- name: Install - Copy "{{ item }}" "{{ inventory_hostname }}':/root/'{{ item | basename }}"
|
- name: Install - Initialize ipaserver_external_cert_files
|
||||||
ansible.builtin.copy:
|
ansible.builtin.set_fact:
|
||||||
src: "{{ item }}"
|
ipaserver_external_cert_files: []
|
||||||
dest: "/root/{{ item | basename }}"
|
when: ipaserver_external_cert_files is undefined
|
||||||
mode: preserve
|
- name: Install - Copy "{{ item + " " + inventory_hostname + ':/root/' + __item_basename }}"
|
||||||
force: yes
|
ansible.builtin.copy:
|
||||||
- name: Install - Extend ipaserver_external_cert_files with "/root/{{ item | basename }}"
|
src: "{{ item }}"
|
||||||
ansible.builtin.set_fact:
|
dest: "/root/{{ __item_basename }}"
|
||||||
ipaserver_external_cert_files: "{{ ipaserver_external_cert_files + ['/root/' + (item | basename)] }}"
|
mode: preserve
|
||||||
|
force: yes
|
||||||
|
- name: Install - Extend ipaserver_external_cert_files with "/root/{{ __item_basename }}"
|
||||||
|
ansible.builtin.set_fact:
|
||||||
|
ipaserver_external_cert_files: "{{ ipaserver_external_cert_files + ['/root/' + (__item_basename)] }}"
|
||||||
|
|||||||
@@ -52,7 +52,7 @@
|
|||||||
>/dev/null
|
>/dev/null
|
||||||
when: ipaserver_firewalld_zone is defined
|
when: ipaserver_firewalld_zone is defined
|
||||||
|
|
||||||
- name: Copy external cert
|
- name: Copy external certs
|
||||||
ansible.builtin.include_tasks: "{{ role_path }}/tasks/copy_external_cert.yml"
|
ansible.builtin.include_tasks: "{{ role_path }}/tasks/copy_external_cert.yml"
|
||||||
with_items: "{{ ipaserver_external_cert_files_from_controller }}"
|
with_items: "{{ ipaserver_external_cert_files_from_controller }}"
|
||||||
when: ipaserver_external_cert_files_from_controller is defined and
|
when: ipaserver_external_cert_files_from_controller is defined and
|
||||||
@@ -314,7 +314,7 @@
|
|||||||
_http_ca_cert: "{{ result_ipaserver_test._http_ca_cert }}"
|
_http_ca_cert: "{{ result_ipaserver_test._http_ca_cert }}"
|
||||||
register: result_ipaserver_setup_ca
|
register: result_ipaserver_setup_ca
|
||||||
|
|
||||||
- name: Copy /root/ipa.csr to "{{ inventory_hostname }}-ipa.csr"
|
- name: Copy /root/ipa.csr to "{{ inventory_hostname + '-ipa.csr' }}"
|
||||||
ansible.builtin.fetch:
|
ansible.builtin.fetch:
|
||||||
src: /root/ipa.csr
|
src: /root/ipa.csr
|
||||||
dest: "{{ inventory_hostname }}-ipa.csr"
|
dest: "{{ inventory_hostname }}-ipa.csr"
|
||||||
|
|||||||
@@ -70,13 +70,13 @@
|
|||||||
ipaadmin_principal: admin
|
ipaadmin_principal: admin
|
||||||
when: ipaadmin_principal is undefined
|
when: ipaadmin_principal is undefined
|
||||||
|
|
||||||
- name: Authenticate using kinit and "{{ ipaadmin_principal }}" password
|
- name: Authenticate using kinit with password for "{{ ipaadmin_principal }}"
|
||||||
ansible.builtin.command: kinit "{{ ipaadmin_principal }}"
|
ansible.builtin.command: kinit "{{ ipaadmin_principal }}"
|
||||||
args:
|
args:
|
||||||
stdin: "{{ ipaadmin_password }}"
|
stdin: "{{ ipaadmin_password }}"
|
||||||
when: ipaadmin_password is defined
|
when: ipaadmin_password is defined
|
||||||
|
|
||||||
- name: Authenticate using kinit and "{{ ipaadmin_principal }}" keytab
|
- name: Authenticate using kinit with keytab for "{{ ipaadmin_principal }}"
|
||||||
ansible.builtin.command: kinit -kt "{{ ipaadmin_keytab }}" "{{ ipaadmin_principal }}"
|
ansible.builtin.command: kinit -kt "{{ ipaadmin_keytab }}" "{{ ipaadmin_principal }}"
|
||||||
when: ipaadmin_keytab is defined
|
when: ipaadmin_keytab is defined
|
||||||
|
|
||||||
|
|||||||
@@ -42,7 +42,7 @@
|
|||||||
|
|
||||||
# INSTALL bind-utils
|
# INSTALL bind-utils
|
||||||
|
|
||||||
- name: Ensure {{ ipasmartcard_server_bindutils_packages }} are installed
|
- name: Ensure bind utilities packages are installed
|
||||||
ansible.builtin.package:
|
ansible.builtin.package:
|
||||||
name: "{{ ipasmartcard_server_bindutils_packages }}"
|
name: "{{ ipasmartcard_server_bindutils_packages }}"
|
||||||
state: present
|
state: present
|
||||||
@@ -55,13 +55,13 @@
|
|||||||
ipaadmin_principal: admin
|
ipaadmin_principal: admin
|
||||||
when: ipaadmin_principal is undefined
|
when: ipaadmin_principal is undefined
|
||||||
|
|
||||||
- name: Athenticate with kinit and "{{ ipaadmin_principal }}" password
|
- name: Athenticate with kinit and password for "{{ ipaadmin_principal }}"
|
||||||
ansible.builtin.command: kinit "{{ ipaadmin_principal }}"
|
ansible.builtin.command: kinit "{{ ipaadmin_principal }}"
|
||||||
args:
|
args:
|
||||||
stdin: "{{ ipaadmin_password }}"
|
stdin: "{{ ipaadmin_password }}"
|
||||||
when: ipaadmin_password is defined
|
when: ipaadmin_password is defined
|
||||||
|
|
||||||
- name: Authenticate with kinit and "{{ ipaadmin_principal }}" keytab
|
- name: Authenticate with kinit and keytab for "{{ ipaadmin_principal }}"
|
||||||
ansible.builtin.command: kinit -kt "{{ ipaadmin_keytab }}" "{{ ipaadmin_principal }}"
|
ansible.builtin.command: kinit -kt "{{ ipaadmin_keytab }}" "{{ ipaadmin_principal }}"
|
||||||
when: ipaadmin_keytab is defined
|
when: ipaadmin_keytab is defined
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user