From: Dimitri Savineau <dsavinea@redhat.com>
Date: Wed, 17 Apr 2019 14:22:59 +0000 (-0400)
Subject: allow using ansible 2.8
X-Git-Tag: v4.0.0rc4~17
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=8edb064606edaca775d9e614b2834596f3d65c7c;p=ceph-ansible.git

allow using ansible 2.8

Currently we only support ansible 2.7
We plan to use 2.8 when it will be release so we have to support both
2.7 and 2.8.

Closes: https://bugzilla.redhat.com/show_bug.cgi?id=1700548

Signed-off-by: Dimitri Savineau <dsavinea@redhat.com>
(cherry picked from commit e471bce76b58b4e64c0c6d18051abc9c9fbd16d6)
---

diff --git a/roles/ceph-agent/meta/main.yml b/roles/ceph-agent/meta/main.yml
index 97e74ffe3..b9fb00701 100644
--- a/roles/ceph-agent/meta/main.yml
+++ b/roles/ceph-agent/meta/main.yml
@@ -4,7 +4,7 @@ galaxy_info:
   author: Alfredo Deza
   description: Installs Ceph Storage Agent
   license: Apache
-  min_ansible_version: 2.4
+  min_ansible_version: 2.7
   platforms:
     - name: EL
       versions:
diff --git a/roles/ceph-client/meta/main.yml b/roles/ceph-client/meta/main.yml
index 057fb2962..e637abf1c 100644
--- a/roles/ceph-client/meta/main.yml
+++ b/roles/ceph-client/meta/main.yml
@@ -4,7 +4,7 @@ galaxy_info:
   author: Sébastien Han
   description: Installs A Ceph Client
   license: Apache
-  min_ansible_version: 2.4
+  min_ansible_version: 2.7
   platforms:
     - name: EL
       versions:
diff --git a/roles/ceph-common/meta/main.yml b/roles/ceph-common/meta/main.yml
index baeee1f7c..8642d3c57 100644
--- a/roles/ceph-common/meta/main.yml
+++ b/roles/ceph-common/meta/main.yml
@@ -4,7 +4,7 @@ galaxy_info:
   author: Sébastien Han
   description: Installs Ceph
   license: Apache
-  min_ansible_version: 2.4
+  min_ansible_version: 2.7
   platforms:
     - name: EL
       versions:
diff --git a/roles/ceph-config/meta/main.yml b/roles/ceph-config/meta/main.yml
index b99355267..21f0a41bd 100644
--- a/roles/ceph-config/meta/main.yml
+++ b/roles/ceph-config/meta/main.yml
@@ -4,7 +4,7 @@ galaxy_info:
   author: Guillaume Abrioux
   description: Handles ceph-ansible initial configuration
   license: Apache
-  min_ansible_version: 2.4
+  min_ansible_version: 2.7
   platforms:
     - name: EL
       versions:
diff --git a/roles/ceph-container-common/meta/main.yml b/roles/ceph-container-common/meta/main.yml
index baeee1f7c..8642d3c57 100644
--- a/roles/ceph-container-common/meta/main.yml
+++ b/roles/ceph-container-common/meta/main.yml
@@ -4,7 +4,7 @@ galaxy_info:
   author: Sébastien Han
   description: Installs Ceph
   license: Apache
-  min_ansible_version: 2.4
+  min_ansible_version: 2.7
   platforms:
     - name: EL
       versions:
diff --git a/roles/ceph-defaults/meta/main.yml b/roles/ceph-defaults/meta/main.yml
index e2f87d73e..d8aa0769e 100644
--- a/roles/ceph-defaults/meta/main.yml
+++ b/roles/ceph-defaults/meta/main.yml
@@ -4,7 +4,7 @@ galaxy_info:
   author: Sébastien Han
   description: Handles ceph-ansible default vars for all roles
   license: Apache
-  min_ansible_version: 2.3
+  min_ansible_version: 2.7
   platforms:
     - name: Ubuntu
       versions:
diff --git a/roles/ceph-validate/tasks/check_system.yml b/roles/ceph-validate/tasks/check_system.yml
index 25d299c1a..8d236ec35 100644
--- a/roles/ceph-validate/tasks/check_system.yml
+++ b/roles/ceph-validate/tasks/check_system.yml
@@ -61,16 +61,16 @@
 
 - name: fail on unsupported ansible version (1.X)
   fail:
-    msg: "Ansible version must be >= 2.4.x, please update!"
+    msg: "Ansible version must be >= 2.7.x, please update!"
   when:
     - ansible_version.major|int < 2
 
 - name: fail on unsupported ansible version
   fail:
-    msg: "Ansible version must be 2.7!"
+    msg: "Ansible version must be 2.7 or 2.8!"
   when:
-    - ansible_version.major|int != 2
-    - ansible_version.minor|int != 7
+    - ansible_version.major|int == 2
+    - ansible_version.minor|int not in [7, 8]
 
 - name: fail if systemd is not present
   fail: