From 01046c33e0bdcaf44dbd9bfcdf84f1a9a335437c Mon Sep 17 00:00:00 2001 From: Rodolfo Carvalho Date: Fri, 13 Jan 2017 17:06:57 +0100 Subject: Rename subrole facts -> init Trying to improve the name, `init` needs to be loaded before calling other subroles. We don't make `init` a dependency of `common`, `masters` and `nodes` to avoid running the relatively slow `openshift_facts` multiple times. --- roles/openshift_preflight/README.md | 3 +-- roles/openshift_preflight/facts/meta/main.yml | 3 --- roles/openshift_preflight/facts/tasks/main.yml | 4 ---- roles/openshift_preflight/init/meta/main.yml | 3 +++ roles/openshift_preflight/init/tasks/main.yml | 4 ++++ 5 files changed, 8 insertions(+), 9 deletions(-) delete mode 100644 roles/openshift_preflight/facts/meta/main.yml delete mode 100644 roles/openshift_preflight/facts/tasks/main.yml create mode 100644 roles/openshift_preflight/init/meta/main.yml create mode 100644 roles/openshift_preflight/init/tasks/main.yml (limited to 'roles') diff --git a/roles/openshift_preflight/README.md b/roles/openshift_preflight/README.md index a3d734e32..b6d3542d3 100644 --- a/roles/openshift_preflight/README.md +++ b/roles/openshift_preflight/README.md @@ -24,9 +24,8 @@ Example Playbook ```yaml --- - hosts: OSEv3 - gather_facts: no roles: - - openshift_preflight/facts + - openshift_preflight/init - hosts: OSEv3 name: checks that apply to all hosts diff --git a/roles/openshift_preflight/facts/meta/main.yml b/roles/openshift_preflight/facts/meta/main.yml deleted file mode 100644 index 0bbeadd34..000000000 --- a/roles/openshift_preflight/facts/meta/main.yml +++ /dev/null @@ -1,3 +0,0 @@ ---- -dependencies: - - role: openshift_facts diff --git a/roles/openshift_preflight/facts/tasks/main.yml b/roles/openshift_preflight/facts/tasks/main.yml deleted file mode 100644 index bf2d82196..000000000 --- a/roles/openshift_preflight/facts/tasks/main.yml +++ /dev/null @@ -1,4 +0,0 @@ ---- -- name: set common variables - set_fact: - oo_preflight_check_results: "{{ oo_preflight_check_results | default([]) }}" diff --git a/roles/openshift_preflight/init/meta/main.yml b/roles/openshift_preflight/init/meta/main.yml new file mode 100644 index 000000000..0bbeadd34 --- /dev/null +++ b/roles/openshift_preflight/init/meta/main.yml @@ -0,0 +1,3 @@ +--- +dependencies: + - role: openshift_facts diff --git a/roles/openshift_preflight/init/tasks/main.yml b/roles/openshift_preflight/init/tasks/main.yml new file mode 100644 index 000000000..bf2d82196 --- /dev/null +++ b/roles/openshift_preflight/init/tasks/main.yml @@ -0,0 +1,4 @@ +--- +- name: set common variables + set_fact: + oo_preflight_check_results: "{{ oo_preflight_check_results | default([]) }}" -- cgit v1.2.3