From: Bruceforce <markus.greis@gmx.de>
Date: Sun, 12 May 2019 09:40:05 +0000 (+0200)
Subject: ceph-nfs: fixed condition for "stable repos specific tasks"
X-Git-Tag: v5.0.0alpha1~349
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=29f2c953b44041d0fe2119d3433b0e8cdcbe6470;p=ceph-ansible.git

ceph-nfs: fixed condition for "stable repos specific tasks"

The old condition would resolve to
"when": "nfs_ganesha_stable - ceph_repository == 'community'"

now it is
"when": [
          "nfs_ganesha_stable",
          "ceph_repository == 'community'"
        ]

Please backport to stable-4.0

Signed-off-by: Bruceforce <markus.greis@gmx.de>
---

diff --git a/roles/ceph-nfs/tasks/pre_requisite_non_container_debian.yml b/roles/ceph-nfs/tasks/pre_requisite_non_container_debian.yml
index db718f308..7c9c33fd8 100644
--- a/roles/ceph-nfs/tasks/pre_requisite_non_container_debian.yml
+++ b/roles/ceph-nfs/tasks/pre_requisite_non_container_debian.yml
@@ -3,7 +3,8 @@
   when: ceph_origin == 'repository'
   block:
     - name: stable repos specific tasks
-      when: nfs_ganesha_stable
+      when:
+        - nfs_ganesha_stable
         - ceph_repository == 'community'
       block:
         - name: add nfs-ganesha stable repository