From 273d26bcd5b4e98a051db74ce1c07ec6552da675 Mon Sep 17 00:00:00 2001 From: =?utf8?q?S=C3=A9bastien=20Han?= Date: Fri, 29 Sep 2017 01:37:10 +0200 Subject: [PATCH] site: fix condition MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit we don't know ceph_stable_release before executing the role so at least we need to run ceph-defaults and ceph-docker-common or ceph-common. Closes: https://bugzilla.redhat.com/show_bug.cgi?id=1486062 Signed-off-by: Sébastien Han --- site-docker.yml.sample | 4 ++-- site.yml.sample | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/site-docker.yml.sample b/site-docker.yml.sample index f01b29372..d10544cf8 100644 --- a/site-docker.yml.sample +++ b/site-docker.yml.sample @@ -37,8 +37,8 @@ become: True gather_facts: false roles: - - { role: ceph-defaults, when: "ceph_release_num.{{ ceph_stable_release }} > ceph_release_num.jewel" } - - { role: ceph-docker-common, when: "ceph_release_num.{{ ceph_stable_release }} > ceph_release_num.jewel" } + - ceph-defaults + - ceph-docker-common - { role: ceph-config, when: "ceph_release_num.{{ ceph_stable_release }} > ceph_release_num.jewel" } - { role: ceph-mgr, when: "ceph_release_num.{{ ceph_stable_release }} > ceph_release_num.jewel" } diff --git a/site.yml.sample b/site.yml.sample index 2e46bbacb..286701a10 100644 --- a/site.yml.sample +++ b/site.yml.sample @@ -65,8 +65,8 @@ gather_facts: false become: True roles: - - { role: ceph-defaults, when: "ceph_release_num.{{ ceph_stable_release }} > ceph_release_num.jewel" } - - { role: ceph-common, when: "ceph_release_num.{{ ceph_stable_release }} > ceph_release_num.jewel" } + - ceph-defaults + - ceph-common - { role: ceph-config, when: "ceph_release_num.{{ ceph_stable_release }} > ceph_release_num.jewel" } - { role: ceph-mgr, when: "ceph_release_num.{{ ceph_stable_release }} > ceph_release_num.jewel" } @@ -146,8 +146,8 @@ gather_facts: false become: True roles: - - { role: ceph-defaults, when: "ceph_release_num.{{ ceph_stable_release }} >= ceph_release_num.luminous" } - - { role: ceph-common, when: "ceph_release_num.{{ ceph_stable_release }} >= ceph_release_num.luminous" } + - ceph-defaults + - ceph-common - { role: ceph-config, when: "ceph_release_num.{{ ceph_stable_release }} >= ceph_release_num.luminous" } - { role: ceph-iscsi-gw, when: "ceph_release_num.{{ ceph_stable_release }} >= ceph_release_num.luminous" } -- 2.47.3