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 97e74ffe35ca4b0674e3468d839244967ddbfb37..b9fb00701401416c4de118074687be1216b3fd2f 100644 (file)
--- 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 057fb2962f395fe5fd67293fab38426690d1fb2c..e637abf1ce39ec0440aa2ccad30571c796fd6d9c 100644 (file)
--- 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 baeee1f7ca60cd4e3aab87af3056c671a9b46288..8642d3c5721165fd9f99b2488cd1dbe0963c50bc 100644 (file)
--- 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 b993552675ae7841304e3f0b7d155357dc8f10a3..21f0a41bd124cc327ee0672b1ceb5a63acc3036e 100644 (file)
--- 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 baeee1f7ca60cd4e3aab87af3056c671a9b46288..8642d3c5721165fd9f99b2488cd1dbe0963c50bc 100644 (file)
--- 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 e2f87d73ee305d1202b01a8d9c558ec76a199b54..d8aa0769ec086c45e87f897d5acf8587b5cf4acb 100644 (file)
--- 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 25d299c1acd586a6fbe9bd2f7617a7ebda389bcd..8d236ec35ea643c482ef76d77d5ae1967b5369a5 100644 (file)
--- 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: