internet/ansible-freeipa
4
0
Fork 0
mirror of https://github.com/freeipa/ansible-freeipa.git synced 2026-08-01 12:24:43 +00:00
Code Issues Projects Releases Wiki Activity

user: Use FQCN for ansible.builtin

Browse Source 
Use Fully Qualified Collection Name (FQCN) for ansible builtins. This is
ansible.builtin.set_fact instead of set_fact for example and aplies for
all actions that are part of ansible.builtin.

All the replaced ansible.builtins:
  assert, command, copy, debug, fail, fetch, file, import_playbook,
  import_tasks, include_role, include_tasks, include_vars, package,
  set_fact, shell, slurp, stat, systemd
This commit is contained in:
Thomas Woerner
2022-12-20 13:55:03 +01:00
parent d5269c83e6
commit 198298b2d0
13 changed files with 29 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
playbooks/user/ensure_user_with_randompassword.yml
View File

@@ -15,5 +15,5 @@
register: ipauser register: ipauser
- name: Print generated random password - name: Print generated random password
debug: ansible.builtin.debug:
var: ipauser.user.randompassword var: ipauser.user.randompassword

4
playbooks/user/ensure_users_with_randompasswords.yml
View File

@@ -20,9 +20,9 @@
register: ipauser register: ipauser
- name: Print generated random password for user1 - name: Print generated random password for user1
debug: ansible.builtin.debug:
var: ipauser.user.user1.randompassword var: ipauser.user.user1.randompassword
- name: Print generated random password for user2 - name: Print generated random password for user2
debug: ansible.builtin.debug:
var: ipauser.user.user2.randompassword var: ipauser.user.user2.randompassword

4
tests/user/certificate/test_user_certificate.yml
View File

@@ -6,7 +6,7 @@
tasks: tasks:
- name: Generate self-signed certificates. - name: Generate self-signed certificates.
shell: ansible.builtin.shell:
cmd: | cmd: |
openssl req -x509 -newkey rsa:2048 -days 365 -nodes -keyout "private{{ item }}.key" -out "cert{{ item }}.pem" -subj '/CN=test' openssl req -x509 -newkey rsa:2048 -days 365 -nodes -keyout "private{{ item }}.key" -out "cert{{ item }}.pem" -subj '/CN=test'
openssl x509 -outform der -in "cert{{ item }}.pem" -out "cert{{ item }}.der" openssl x509 -outform der -in "cert{{ item }}.pem" -out "cert{{ item }}.der"
@@ -81,7 +81,7 @@
failed_when: not result.changed or result.failed failed_when: not result.changed or result.failed
- name: Remove certificate files. # noqa: deprecated-command-syntax - name: Remove certificate files. # noqa: deprecated-command-syntax
shell: ansible.builtin.shell:
cmd: rm -f "private{{ item }}.key" "cert{{ item }}.pem" "cert{{ item }}.der" "cert{{ item }}.b64" cmd: rm -f "private{{ item }}.key" "cert{{ item }}.pem" "cert{{ item }}.der" "cert{{ item }}.b64"
with_items: [1, 2, 3] with_items: [1, 2, 3]
become: no become: no

4
tests/user/certificate/test_users_certificate.yml
View File

@@ -6,7 +6,7 @@
tasks: tasks:
- name: Generate self-signed certificates. - name: Generate self-signed certificates.
shell: ansible.builtin.shell:
cmd: | cmd: |
openssl req -x509 -newkey rsa:2048 -days 365 -nodes -keyout "private{{ item }}.key" -out "cert{{ item }}.pem" -subj '/CN=test' openssl req -x509 -newkey rsa:2048 -days 365 -nodes -keyout "private{{ item }}.key" -out "cert{{ item }}.pem" -subj '/CN=test'
openssl x509 -outform der -in "cert{{ item }}.pem" -out "cert{{ item }}.der" openssl x509 -outform der -in "cert{{ item }}.pem" -out "cert{{ item }}.der"
@@ -94,7 +94,7 @@
failed_when: not result.changed or result.failed failed_when: not result.changed or result.failed
- name: Remove certificate files. # noqa: deprecated-command-syntax - name: Remove certificate files. # noqa: deprecated-command-syntax
shell: ansible.builtin.shell:
cmd: rm -f "private{{ item }}.key" "cert{{ item }}.pem" "cert{{ item }}.der" "cert{{ item }}.b64" cmd: rm -f "private{{ item }}.key" "cert{{ item }}.pem" "cert{{ item }}.der" "cert{{ item }}.b64"
with_items: [1, 2, 3] with_items: [1, 2, 3]
become: no become: no

4
tests/user/certmapdata/test_user_certmapdata.yml
View File

@@ -6,7 +6,7 @@
tasks: tasks:
- name: Generate self-signed certificates. - name: Generate self-signed certificates.
shell: ansible.builtin.shell:
cmd: | cmd: |
openssl req -x509 -newkey rsa:2048 -days 365 -nodes -keyout "private{{ item }}.key" -out "cert{{ item }}.pem" -subj '/CN=test' openssl req -x509 -newkey rsa:2048 -days 365 -nodes -keyout "private{{ item }}.key" -out "cert{{ item }}.pem" -subj '/CN=test'
openssl x509 -outform der -in "cert{{ item }}.pem" -out "cert{{ item }}.der" openssl x509 -outform der -in "cert{{ item }}.pem" -out "cert{{ item }}.der"
@@ -226,7 +226,7 @@
failed_when: not result.changed or result.failed failed_when: not result.changed or result.failed
- name: Remove certificate files. # noqa: deprecated-command-syntax - name: Remove certificate files. # noqa: deprecated-command-syntax
shell: ansible.builtin.shell:
cmd: rm -f "private{{ item }}.key" "cert{{ item }}.pem" "cert{{ item }}.der" "cert{{ item }}.b64" cmd: rm -f "private{{ item }}.key" "cert{{ item }}.pem" "cert{{ item }}.der" "cert{{ item }}.b64"
with_items: [1, 2, 3] with_items: [1, 2, 3]
become: no become: no

4
tests/user/certmapdata/test_users_certmapdata.yml
View File

@@ -6,7 +6,7 @@
tasks: tasks:
- name: Generate self-signed certificates. - name: Generate self-signed certificates.
shell: ansible.builtin.shell:
cmd: | cmd: |
openssl req -x509 -newkey rsa:2048 -days 365 -nodes -keyout "private{{ item }}.key" -out "cert{{ item }}.pem" -subj '/CN=test' openssl req -x509 -newkey rsa:2048 -days 365 -nodes -keyout "private{{ item }}.key" -out "cert{{ item }}.pem" -subj '/CN=test'
openssl x509 -outform der -in "cert{{ item }}.pem" -out "cert{{ item }}.der" openssl x509 -outform der -in "cert{{ item }}.pem" -out "cert{{ item }}.der"
@@ -162,7 +162,7 @@
failed_when: not result.changed or result.failed failed_when: not result.changed or result.failed
- name: Remove certificate files. # noqa: deprecated-command-syntax - name: Remove certificate files. # noqa: deprecated-command-syntax
shell: ansible.builtin.shell:
cmd: rm -f "private{{ item }}.key" "cert{{ item }}.pem" "cert{{ item }}.der" "cert{{ item }}.b64" cmd: rm -f "private{{ item }}.key" "cert{{ item }}.pem" "cert{{ item }}.der" "cert{{ item }}.b64"
with_items: [1, 2, 3] with_items: [1, 2, 3]
become: no become: no

4
tests/user/create_users_json.yml
View File

@@ -4,10 +4,10 @@
tasks: tasks:
- name: Check if users.json exists - name: Check if users.json exists
stat: ansible.builtin.stat:
path: users.json path: users.json
register: register_stat_users register: register_stat_users
- name: Create users.json - name: Create users.json
command: /bin/bash users.sh 500 ansible.builtin.command: /bin/bash users.sh 500
when: not register_stat_users.stat.exists when: not register_stat_users.stat.exists

6
tests/user/test_user_client_context.yml
View File

@@ -6,7 +6,7 @@
tasks: tasks:
- name: Include FreeIPA facts. - name: Include FreeIPA facts.
include_tasks: ../env_freeipa_facts.yml ansible.builtin.include_tasks: ../env_freeipa_facts.yml
# Test will only be executed if host is not a server. # Test will only be executed if host is not a server.
- name: Execute with server context in the client. - name: Execute with server context in the client.
@@ -27,13 +27,13 @@
# in upstream CI. # in upstream CI.
- name: Test user using client context, in client host. - name: Test user using client context, in client host.
import_playbook: test_user.yml ansible.builtin.import_playbook: test_user.yml
when: groups['ipaclients'] when: groups['ipaclients']
vars: vars:
ipa_test_host: ipaclients ipa_test_host: ipaclients
- name: Test user using client context, in server host. - name: Test user using client context, in server host.
import_playbook: test_user.yml ansible.builtin.import_playbook: test_user.yml
when: groups['ipaclients'] is not defined or not groups['ipaclients'] when: groups['ipaclients'] is not defined or not groups['ipaclients']
vars: vars:
ipa_context: client ipa_context: client

6
tests/user/test_user_random.yml
View File

@@ -26,7 +26,7 @@
ipauser.failed ipauser.failed
- name: Print generated random password - name: Print generated random password
debug: ansible.builtin.debug:
var: ipauser.user.randompassword var: ipauser.user.randompassword
- name: User user1 absent - name: User user1 absent
@@ -56,11 +56,11 @@
ipauser.failed ipauser.failed
- name: Print generated random password for user1 - name: Print generated random password for user1
debug: ansible.builtin.debug:
var: ipauser.user.user1.randompassword var: ipauser.user.user1.randompassword
- name: Print generated random password for user2 - name: Print generated random password for user2
debug: ansible.builtin.debug:
var: ipauser.user.user2.randompassword var: ipauser.user.user2.randompassword
- name: Users user1 and user2 absent - name: Users user1 and user2 absent

6
tests/user/test_users_absent.yml
View File

@@ -1,6 +1,6 @@
--- ---
- name: Include create_users_json.yml - name: Include create_users_json.yml
import_playbook: create_users_json.yml ansible.builtin.import_playbook: create_users_json.yml
- name: Test users absent - name: Test users absent
hosts: ipaserver hosts: ipaserver
@@ -9,11 +9,11 @@
tasks: tasks:
- name: Include users.json - name: Include users.json
include_vars: ansible.builtin.include_vars:
file: users.json # noqa 505 file: users.json # noqa 505
- name: Create dict with user names - name: Create dict with user names
set_fact: ansible.builtin.set_fact:
user_names: "{{ user_names | default([]) + [{ 'name': item.name }] }}" user_names: "{{ user_names | default([]) + [{ 'name': item.name }] }}"
loop: "{{ users }}" loop: "{{ users }}"

4
tests/user/test_users_invalid_cert.yml
View File

@@ -6,7 +6,7 @@
tasks: tasks:
- name: Generate self-signed certificates. - name: Generate self-signed certificates.
shell: ansible.builtin.shell:
cmd: | cmd: |
openssl req -x509 -newkey rsa:2048 -days 365 -nodes -keyout "private{{ item }}.key" -out "cert{{ item }}.pem" -subj '/CN=test' openssl req -x509 -newkey rsa:2048 -days 365 -nodes -keyout "private{{ item }}.key" -out "cert{{ item }}.pem" -subj '/CN=test'
openssl x509 -outform der -in "cert{{ item }}.pem" -out "cert{{ item }}.der" openssl x509 -outform der -in "cert{{ item }}.pem" -out "cert{{ item }}.der"
@@ -55,7 +55,7 @@
failed_when: not result.changed or result.failed failed_when: not result.changed or result.failed
- name: Remove certificate files. # noqa: deprecated-command-syntax - name: Remove certificate files. # noqa: deprecated-command-syntax
shell: ansible.builtin.shell:
cmd: rm -f "private{{ item }}.key" "cert{{ item }}.pem" "cert{{ item }}.der" "cert{{ item }}.b64" cmd: rm -f "private{{ item }}.key" "cert{{ item }}.pem" "cert{{ item }}.der" "cert{{ item }}.b64"
with_items: [1, 2] with_items: [1, 2]
become: no become: no

4
tests/user/test_users_present.yml
View File

@@ -1,6 +1,6 @@
--- ---
- name: Include create_users_json.yml - name: Include create_users_json.yml
import_playbook: create_users_json.yml ansible.builtin.import_playbook: create_users_json.yml
- name: Test users present - name: Test users present
hosts: ipaserver hosts: ipaserver
@@ -9,7 +9,7 @@
tasks: tasks:
- name: Include users.json - name: Include users.json
include_vars: ansible.builtin.include_vars:
file: users.json # noqa 505 file: users.json # noqa 505
- name: Users present len:{{ users | length }} - name: Users present len:{{ users | length }}

6
tests/user/test_users_present_slice.yml
View File

@@ -1,6 +1,6 @@
--- ---
- name: Include create_users_json.yml - name: Include create_users_json.yml
import_playbook: create_users_json.yml ansible.builtin.import_playbook: create_users_json.yml
- name: Test users present slice - name: Test users present slice
hosts: ipaserver hosts: ipaserver
@@ -11,10 +11,10 @@
slice_size: 500 slice_size: 500
tasks: tasks:
- name: Include users.json - name: Include users.json
include_vars: ansible.builtin.include_vars:
file: users.json # noqa 505 file: users.json # noqa 505
- name: Size of users slice. - name: Size of users slice.
debug: ansible.builtin.debug:
msg: "{{ users | length }}" msg: "{{ users | length }}"
- name: Users present - name: Users present
ipauser: ipauser: