From 1e6be847c5a32e476b8c17bcda615b9071801990 Mon Sep 17 00:00:00 2001
From: Lars Beckers <lars.beckers@rwth-aachen.de>
Date: Sat, 26 Oct 2019 11:16:16 +0200
Subject: [PATCH] nfs-server: fix deployment for non-krb servers
---
nfs-server/tasks/main.yml | 6 +++---
nfs-server/templates/exports.j2 | 6 ++----
2 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/nfs-server/tasks/main.yml b/nfs-server/tasks/main.yml
index 327ff5e..049ecdd 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 f39eb73..02605e7 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 %}
--
GitLab