internet/ansible-freeipa
4
0
Fork 0
mirror of https://github.com/freeipa/ansible-freeipa.git synced 2026-05-06 21:33:14 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #461 from t-woerner/fix_ipabackup_shell_vars_no_else

Browse Source 
ipabackup: Fix undefined vars for conditions in shell tasks without else
This commit is contained in:
Thomas Woerner
2020-12-02 13:45:03 +01:00
committed by GitHub
parent 06d73ba8df 923208b98c
commit 3802e494ef
2 changed files with 22 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
roles/ipabackup/tasks/backup.yml
View File

@@ -4,13 +4,13 @@
- name: Create backup
shell: >
ipa-backup
{{ "--gpg" if ipabackup_gpg | bool }}
{{ "--gpg-keyring="+ipabackup_gpg_keyring if ipabackup_gpg_keyring is defined }}
{{ "--data" if ipabackup_data | bool }}
{{ "--logs" if ipabackup_logs | bool }}
{{ "--online" if ipabackup_online | bool }}
{{ "--disable-role-check" if ipabackup_disable_role_check | bool }}
{{ "--log-file="+ipabackup_log_file if ipabackup_log_file is defined }}
{{ "--gpg" if ipabackup_gpg | bool else "" }}
{{ "--gpg-keyring="+ipabackup_gpg_keyring if ipabackup_gpg_keyring is defined else "" }}
{{ "--data" if ipabackup_data | bool else "" }}
{{ "--logs" if ipabackup_logs | bool else "" }}
{{ "--online" if ipabackup_online | bool else "" }}
{{ "--disable-role-check" if ipabackup_disable_role_check | bool else "" }}
{{ "--log-file="+ipabackup_log_file if ipabackup_log_file is defined else "" }}
register: result_ipabackup
- block:

30
roles/ipabackup/tasks/restore.yml
View File

@@ -105,13 +105,13 @@
ipa-restore
{{ ipabackup_item }}
--unattended
{{ "--password="+ipabackup_password if ipabackup_password is defined }}
{{ "--data" if ipabackup_data | bool }}
{{ "--online" if ipabackup_online | bool }}
{{ "--instance="+ipabackup_instance if ipabackup_instance is defined }}
{{ "--backend="+ipabackup_backend if ipabackup_backend is defined }}
{{ "--no-logs" if ipabackup_no_logs | bool }}
{{ "--log-file="+ipabackup_log_file if ipabackup_log_file is defined }}
{{ "--password="+ipabackup_password if ipabackup_password is defined else "" }}
{{ "--data" if ipabackup_data | bool else "" }}
{{ "--online" if ipabackup_online | bool else "" }}
{{ "--instance="+ipabackup_instance if ipabackup_instance is defined else "" }}
{{ "--backend="+ipabackup_backend if ipabackup_backend is defined else "" }}
{{ "--no-logs" if ipabackup_no_logs | bool else "" }}
{{ "--log-file="+ipabackup_log_file if ipabackup_log_file is defined else "" }}
register: result_iparestore
ignore_errors: yes
@@ -127,21 +127,21 @@
command: >
firewall-cmd
--permanent
--zone="{{ ipabackup_firewalld_zone if ipabackup_firewalld_zone is defined }}"
{{ "--zone="+ipabackup_firewalld_zone if ipabackup_firewalld_zone is defined else "" }}
--add-service=freeipa-ldap
--add-service=freeipa-ldaps
{{ "--add-service=freeipa-trust" if ipabackup_service_adtrust in ipabackup_services }}
{{ "--add-service=dns" if ipabackup_service_dns in ipabackup_services }}
{{ "--add-service=ntp" if ipabackup_service_ntp in ipabackup_services }}
{{ "--add-service=freeipa-trust" if ipabackup_service_adtrust in ipabackup_services else "" }}
{{ "--add-service=dns" if ipabackup_service_dns in ipabackup_services else "" }}
{{ "--add-service=ntp" if ipabackup_service_ntp in ipabackup_services else "" }}
when: ipabackup_setup_firewalld | bool
- name: Configure firewalld runtime
command: >
firewall-cmd
--zone="{{ ipabackup_firewalld_zone if ipabackup_firewalld_zone is defined }}"
{{ "--zone="+ipabackup_firewalld_zone if ipabackup_firewalld_zone is defined else "" }}
--add-service=freeipa-ldap
--add-service=freeipa-ldaps
{{ "--add-service=freeipa-trust" if ipabackup_service_adtrust in ipabackup_services }}
{{ "--add-service=dns" if ipabackup_service_dns in ipabackup_services }}
{{ "--add-service=ntp" if ipabackup_service_ntp in ipabackup_services }}
{{ "--add-service=freeipa-trust" if ipabackup_service_adtrust in ipabackup_services else "" }}
{{ "--add-service=dns" if ipabackup_service_dns in ipabackup_services else "" }}
{{ "--add-service=ntp" if ipabackup_service_ntp in ipabackup_services else "" }}
when: ipabackup_setup_firewalld | bool