From d89ddb1cee998e4098374a73e26864d844f0c952 Mon Sep 17 00:00:00 2001 From: crcceph Date: Wed, 16 Dec 2015 11:01:39 -0800 Subject: [PATCH] moved set_fact higher in file moved set_fact for is_ceph_infernalis near top of file so that it can be used in other tests --- roles/ceph-common/tasks/main.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/roles/ceph-common/tasks/main.yml b/roles/ceph-common/tasks/main.yml index 30ecba5a2..46752906c 100644 --- a/roles/ceph-common/tasks/main.yml +++ b/roles/ceph-common/tasks/main.yml @@ -37,6 +37,12 @@ radosgw_frontend == 'apache' and rgw_group_name in group_names +# NOTE (leseb): be careful with the following +# somehow the YAML syntax using "is_ceph_infernalis: {{" +# does NOT work, so we keep this syntax styling... +- set_fact: + is_ceph_infernalis={{ (ceph_stable and ceph_stable_release not in ceph_stable_releases) or (ceph_stable_rh_storage and (rh_storage_version.stdout | version_compare('0.94', '>'))) }} + - name: check for a ceph socket shell: "stat /var/run/ceph/*.asok > /dev/null 2>&1" changed_when: false @@ -100,12 +106,6 @@ - restart ceph rgws on red hat - restart ceph rgws with systemd -# NOTE (leseb): be careful with the following -# somehow the YAML syntax using "is_ceph_infernalis: {{" -# does NOT work, so we keep this syntax styling... -- set_fact: - is_ceph_infernalis={{ (ceph_stable and ceph_stable_release not in ceph_stable_releases) or (ceph_stable_rh_storage and (rh_storage_version.stdout | version_compare('0.94', '>'))) }} - - name: create rbd client directory (before infernalis) file: path: "{{ rbd_client_admin_socket_path }}" -- 2.39.5