From b47c4fd1a0ac096022beaac56cccdcea6f8819f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Han?= Date: Tue, 3 Oct 2017 15:19:07 +0200 Subject: [PATCH] site: always play ceph-defaults and ceph-docker-common MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit So we can later evaluate the conditions. Also fix the variable, we are comparing ceph_release not ceph_stable_release Closes: https://bugzilla.redhat.com/show_bug.cgi?id=1486062 Signed-off-by: Sébastien Han --- site-docker.yml.sample | 12 ++++++------ site.yml.sample | 12 ++++++------ 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/site-docker.yml.sample b/site-docker.yml.sample index 6e3bcedf5..6f3aef102 100644 --- a/site-docker.yml.sample +++ b/site-docker.yml.sample @@ -39,8 +39,8 @@ roles: - ceph-defaults - ceph-docker-common - - { role: ceph-config, when: "ceph_release_num.{{ ceph_release }} > ceph_release_num.jewel" } - - { role: ceph-mgr, when: "ceph_release_num.{{ ceph_release }} > ceph_release_num.jewel" } + - { role: ceph-config, when: "ceph_release_num.{{ ceph_release }} >= ceph_release_num.luminous" } + - { role: ceph-mgr, when: "ceph_release_num.{{ ceph_release }} >= ceph_release_num.luminous" } - hosts: osds become: True @@ -73,10 +73,10 @@ become: True gather_facts: false roles: - - { role: ceph-defaults, when: "ceph_release_num.{{ ceph_stable_release }} >= ceph_release_num.luminous" } - - { role: ceph-docker-common, when: "ceph_release_num.{{ ceph_stable_release }} >= ceph_release_num.luminous" } - - { role: ceph-config, when: "ceph_release_num.{{ ceph_stable_release }} >= ceph_release_num.luminous" } - - { role: ceph-nfs, when: "ceph_release_num.{{ ceph_stable_release }} >= ceph_release_num.luminous" } + - ceph-defaults + - ceph-docker-common + - { role: ceph-config, when: "ceph_release_num.{{ ceph_release }} >= ceph_release_num.luminous" } + - { role: ceph-nfs, when: "ceph_release_num.{{ ceph_release }} >= ceph_release_num.luminous" } - hosts: rbdmirrors become: True diff --git a/site.yml.sample b/site.yml.sample index 4ae0cc54f..be79b4800 100644 --- a/site.yml.sample +++ b/site.yml.sample @@ -67,8 +67,8 @@ roles: - ceph-defaults - ceph-common - - { role: ceph-config, when: "ceph_release_num.{{ ceph_release }} > ceph_release_num.jewel" } - - { role: ceph-mgr, when: "ceph_release_num.{{ ceph_release }} > ceph_release_num.jewel" } + - { role: ceph-config, when: "ceph_release_num.{{ ceph_release }} >= ceph_release_num.luminous" } + - { role: ceph-mgr, when: "ceph_release_num.{{ ceph_release }} >= ceph_release_num.luminous" } - hosts: agents gather_facts: false @@ -110,10 +110,10 @@ 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" } - - { role: ceph-config, when: "ceph_release_num.{{ ceph_stable_release }} >= ceph_release_num.luminous" } - - { role: ceph-nfs, when: "ceph_release_num.{{ ceph_stable_release }} >= ceph_release_num.luminous" } + - ceph-defaults + - ceph-common + - { role: ceph-config, when: "ceph_release_num.{{ ceph_release }} >= ceph_release_num.luminous" } + - { role: ceph-nfs, when: "ceph_release_num.{{ ceph_release }} >= ceph_release_num.luminous" } - hosts: restapis gather_facts: false