From: Guillaume Abrioux <gabrioux@redhat.com>
Date: Thu, 14 Mar 2019 21:03:16 +0000 (+0100)
Subject: Revert "site.yml: run ceph-validate before facts/defaults roles"
X-Git-Tag: v4.0.0rc1~34
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=655bdb189c85bfdcf5f2e57629bab99a86e6fc3d;p=ceph-ansible.git

Revert "site.yml: run ceph-validate before facts/defaults roles"

This commit wasn't making any sense and should have never got merged.

Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
---

diff --git a/site-container.yml.sample b/site-container.yml.sample
index b2fc55585..3e9bab72f 100644
--- a/site-container.yml.sample
+++ b/site-container.yml.sample
@@ -62,13 +62,13 @@
       set_fact:
         container_binary: "{{ 'podman' if (podman_binary.stat.exists and ansible_distribution == 'Fedora') or (ansible_os_family == 'RedHat' and ansible_distribution_major_version == '8') else 'docker' }}"
 
-    - import_role:
-        name: ceph-validate
     - import_role:
         name: ceph-defaults
       tags: [with_pkg, fetch_container_image]
     - import_role:
         name: ceph-facts
+    - import_role:
+        name: ceph-validate
     - import_role:
         name: ceph-infra
     - import_role:
diff --git a/site.yml.sample b/site.yml.sample
index 9ff9bba28..2290a3b70 100644
--- a/site.yml.sample
+++ b/site.yml.sample
@@ -66,12 +66,12 @@
         - always
 
   tasks:
-    - import_role:
-        name: ceph-validate
     - import_role:
         name: ceph-defaults
     - import_role:
         name: ceph-facts
+    - import_role:
+        name: ceph-validate
     - import_role:
         name: ceph-infra