ceph
/
ceph-ansible
mirror of https://github.com/ceph/ceph-ansible.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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>
pull/3719/head
Guillaume Abrioux 2019-03-14 22:03:16 +01:00 committed by mergify[bot]
parent f7b20dbb48
commit 655bdb189c
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
site-container.yml.sample
View File

@ -62,13 +62,13 @@
set_fact: 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' }}" 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: - import_role:
name: ceph-defaults name: ceph-defaults
tags: [with_pkg, fetch_container_image] tags: [with_pkg, fetch_container_image]
- import_role: - import_role:
name: ceph-facts name: ceph-facts
- import_role:
name: ceph-validate
- import_role: - import_role:
name: ceph-infra name: ceph-infra
- import_role: - import_role:

4
site.yml.sample
View File

@ -66,12 +66,12 @@
- always - always
tasks: tasks:
- import_role:
name: ceph-validate
- import_role: - import_role:
name: ceph-defaults name: ceph-defaults
- import_role: - import_role:
name: ceph-facts name: ceph-facts
- import_role:
name: ceph-validate
- import_role: - import_role:
name: ceph-infra name: ceph-infra