From c4aec0fbd112fd1c8503e935ac954da268a2fdff Mon Sep 17 00:00:00 2001 From: Rodolfo Carvalho Date: Thu, 12 Jan 2017 18:30:24 +0100 Subject: Replace custom variables with openshift_facts Note: on a simple example run of ansible-playbook against a single docker-based host, I saw the execution time jump from 7s to 17s. That's unfortunate, but it is probably better to reuse openshift_facts, than to come up with new variables. --- roles/openshift_preflight/facts/meta/main.yml | 3 +++ roles/openshift_preflight/facts/tasks/main.yml | 3 --- 2 files changed, 3 insertions(+), 3 deletions(-) create mode 100644 roles/openshift_preflight/facts/meta/main.yml (limited to 'roles/openshift_preflight/facts') diff --git a/roles/openshift_preflight/facts/meta/main.yml b/roles/openshift_preflight/facts/meta/main.yml new file mode 100644 index 000000000..0bbeadd34 --- /dev/null +++ b/roles/openshift_preflight/facts/meta/main.yml @@ -0,0 +1,3 @@ +--- +dependencies: + - role: openshift_facts diff --git a/roles/openshift_preflight/facts/tasks/main.yml b/roles/openshift_preflight/facts/tasks/main.yml index 15a108510..bf2d82196 100644 --- a/roles/openshift_preflight/facts/tasks/main.yml +++ b/roles/openshift_preflight/facts/tasks/main.yml @@ -1,7 +1,4 @@ --- - name: set common variables set_fact: - deployment_type: "{{ deployment_type | default('openshift-enterprise') }}" - containerized: "{{ containerized | default('no') | bool }}" - openshift_release: "{{ openshift_release | default('3.3') }}" oo_preflight_check_results: "{{ oo_preflight_check_results | default([]) }}" -- cgit v1.2.3