diff --git a/nfs-server/tasks/main.yml b/nfs-server/tasks/main.yml index 327ff5e3eb566771590df7d8ee5e833f693ffe6f..049ecdd1fb22bfbd2adc29ef1ac53025fb965f53 100644 --- a/nfs-server/tasks/main.yml +++ b/nfs-server/tasks/main.yml @@ -75,7 +75,7 @@ tags: - nfs-server - service-principal - when: nfs_krb is defined + when: nfs_krb|default(False) - name: check that we have a valid service principal shell: | @@ -88,7 +88,7 @@ tags: - nfs-server - service-principal - when: nfs_krb is defined + when: nfs_krb|default(False) - block: - name: create service principal @@ -157,6 +157,6 @@ tags: - nfs-server - service-principal - when: principal.rc == 1 and nfs_krb is defined + when: nfs_krb|default(False) and principal.rc == 1 - meta: flush_handlers diff --git a/nfs-server/templates/exports.j2 b/nfs-server/templates/exports.j2 index f39eb7395bcd4d0617eb19a58242c3e874a8d399..02605e7b94163fc891a1d36abe65ce4e0ab40cb2 100644 --- a/nfs-server/templates/exports.j2 +++ b/nfs-server/templates/exports.j2 @@ -9,8 +9,6 @@ # /srv/nfs4/homes gss/krb5i(rw,sync,no_subtree_check) # -{%- for export in nfs_exports %} +{% for export in nfs_exports %} {{ export.src }} {{ export.dest }}({{ export.options }}) -{% endfor -%} - - +{% endfor %}