]> git.apps.os.sepia.ceph.com Git - ceph-ansible.git/commitdiff
common: do not override ceph_release when using custom repo
authorGuillaume Abrioux <gabrioux@redhat.com>
Thu, 17 Oct 2019 15:05:53 +0000 (17:05 +0200)
committerDimitri Savineau <savineau.dimitri@gmail.com>
Fri, 18 Oct 2019 00:10:47 +0000 (20:10 -0400)
Otherwise it fails like following:

```
TASK [ceph-mds : allow multimds] **************************************************************************************************************************************************
Monday 22 July 2019  16:37:38 +0800 (0:00:03.269)       0:13:25.651 ***********
fatal: [rhel7u6clone1]: FAILED! => {"msg": "The conditional check 'ceph_release_num[ceph_release] == ceph_release_num.luminous' failed. The error was: error while evaluating conditional (ceph_release_num[ceph_release] == ceph_release_num.luminous): 'dict object' has no attribute u'dummy'\n\nThe error appears to have been in '/usr/share/ceph-ansible/roles/ceph-mds/tasks/create_mds_filesystems.yml': line 43, column 3, but may\nbe elsewhere in the file depending on the exact syntax problem.\n\nThe offending line appears to be:\n\n\n- name: allow multimds\n  ^ here\n"}
```

Closes: https://bugzilla.redhat.com/show_bug.cgi?id=1645379
Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
(cherry picked from commit 4e9504c939a1daddceef3806f7165844952a6618)

roles/ceph-common/tasks/main.yml

index 6c33f9b71ae4c70f7442c79616a1469c50938c48..2239aad061bb1c5a95601099452a659997e45dd6 100644 (file)
@@ -42,7 +42,7 @@
     ceph_release: "{{ ceph_stable_release }}"
   when:
     - ceph_origin == 'repository'
-    - ceph_repository not in ['dev', 'rhcs']
+    - ceph_repository not in ['dev', 'rhcs', 'custom']
   tags: always
 
 - name: include create_rbd_client_dir.yml