Merge pull request #461 from t-woerner/fix_ipabackup_shell_vars_no_else

ipabackup: Fix undefined vars for conditions in shell tasks without else

roles/ipabackup/tasks/backup.yml

@@ -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:

roles/ipabackup/tasks/restore.yml

@@ -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

roles/ipareplica/library/ipareplica_prepare.py

@@ -325,8 +325,6 @@ def main():
         'external_cert_files')
     # options.subject_base = ansible_module.params.get('subject_base')
     # options.ca_subject = ansible_module.params.get('ca_subject')
-    options.no_dnssec_validation = ansible_module.params.get(
-        'no_dnssec_validation')
     # dns
     options.allow_zone_overlap = ansible_module.params.get(
         'allow_zone_overlap')
@@ -338,7 +336,7 @@ def main():
     options.auto_forwarders = ansible_module.params.get('auto_forwarders')
     options.forward_policy = ansible_module.params.get('forward_policy')
     options.no_dnssec_validation = ansible_module.params.get(
-        'no_dnssec_validationdnssec_validation')
+        'no_dnssec_validation')
     # ad trust
     options.enable_compat = ansible_module.params.get('enable_compat')
     options.netbios_name = ansible_module.params.get('netbios_name')

roles/ipareplica/library/ipareplica_setup_dns.py

@@ -143,7 +143,7 @@ def main():
     options.forwarders = ansible_module.params.get('forwarders')
     options.forward_policy = ansible_module.params.get('forward_policy')
     options.no_dnssec_validation = ansible_module.params.get(
-        'no_dnssec_validationdnssec_validation')
+        'no_dnssec_validation')
     # additional
     dns.ip_addresses = ansible_module_get_parsed_ip_addresses(
         ansible_module, 'dns_ip_addresses')

utils/build-galaxy-release.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 
-namespace="${1:freeipa}"
-collection="${2:ansible_freeipa}"
+namespace="${1-freeipa}"
+collection="${2-ansible_freeipa}"
 collection_prefix="${namespace}.${collection}"
 
 galaxy_version=$(git describe --tags | sed -e "s/^v//")

utils/changelog

@@ -87,7 +87,7 @@ def store(commits, prs, authors, commit, author, merge, msg):
 
 def get_commit(commits, commit):
     _commits = [value for key, value in commits.items()
-                if key.startswith(merge)]
+                if key.startswith(commit)]
     if len(_commits) == 1:
         return _commits[0]
     return commit