From 9041a816210132b1dad86217ecfef5f9fec4a8d2 Mon Sep 17 00:00:00 2001 From: Rodolfo Carvalho Date: Fri, 6 Jan 2017 20:53:05 +0100 Subject: Refactor preflight check into roles --- roles/openshift_preflight/common/library | 1 + roles/openshift_preflight/common/tasks/main.yml | 22 ++++++++++++++++++++++ 2 files changed, 23 insertions(+) create mode 120000 roles/openshift_preflight/common/library create mode 100644 roles/openshift_preflight/common/tasks/main.yml (limited to 'roles/openshift_preflight/common') diff --git a/roles/openshift_preflight/common/library b/roles/openshift_preflight/common/library new file mode 120000 index 000000000..ba40d2f56 --- /dev/null +++ b/roles/openshift_preflight/common/library @@ -0,0 +1 @@ +../../../library \ No newline at end of file diff --git a/roles/openshift_preflight/common/tasks/main.yml b/roles/openshift_preflight/common/tasks/main.yml new file mode 100644 index 000000000..423b13586 --- /dev/null +++ b/roles/openshift_preflight/common/tasks/main.yml @@ -0,0 +1,22 @@ +--- +# check content available on all hosts +- when: + - not containerized + block: + + - name: determine if yum update will work + action: check_yum_update + register: r + + - set_fact: + oo_preflight_check_results: "{{ oo_preflight_check_results + [r|combine({'_task': 'check content available on all hosts'})] }}" + + - name: determine if expected version matches what is available + aos_version: + version: "{{ openshift_release }}" + when: + - deployment_type == "openshift-enterprise" + register: r + + - set_fact: + oo_preflight_check_results: "{{ oo_preflight_check_results + [r|combine({'_task': 'determine if expected version matches what is available'})] }}" -- cgit v1.2.3 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/common/tasks/main.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'roles/openshift_preflight/common') diff --git a/roles/openshift_preflight/common/tasks/main.yml b/roles/openshift_preflight/common/tasks/main.yml index 423b13586..bb54d0380 100644 --- a/roles/openshift_preflight/common/tasks/main.yml +++ b/roles/openshift_preflight/common/tasks/main.yml @@ -1,7 +1,6 @@ --- # check content available on all hosts -- when: - - not containerized +- when: not openshift.common.is_containerized | bool block: - name: determine if yum update will work -- cgit v1.2.3 From ac4db698d82d405f3b213f222ae22f62213af000 Mon Sep 17 00:00:00 2001 From: Rodolfo Carvalho Date: Thu, 12 Jan 2017 19:18:55 +0100 Subject: Fix inconsistent task name --- roles/openshift_preflight/common/tasks/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'roles/openshift_preflight/common') diff --git a/roles/openshift_preflight/common/tasks/main.yml b/roles/openshift_preflight/common/tasks/main.yml index bb54d0380..f1a4a160e 100644 --- a/roles/openshift_preflight/common/tasks/main.yml +++ b/roles/openshift_preflight/common/tasks/main.yml @@ -8,7 +8,7 @@ register: r - set_fact: - oo_preflight_check_results: "{{ oo_preflight_check_results + [r|combine({'_task': 'check content available on all hosts'})] }}" + oo_preflight_check_results: "{{ oo_preflight_check_results + [r|combine({'_task': 'determine if yum update will work'})] }}" - name: determine if expected version matches what is available aos_version: -- cgit v1.2.3 From 43b22a73c43d8975403994b5f085735e1d3786ba Mon Sep 17 00:00:00 2001 From: Rodolfo Carvalho Date: Fri, 13 Jan 2017 10:06:40 +0100 Subject: Move Python modules into role Allow reuse via role dependency. --- roles/openshift_preflight/common/library | 1 - roles/openshift_preflight/common/meta/main.yml | 3 +++ 2 files changed, 3 insertions(+), 1 deletion(-) delete mode 120000 roles/openshift_preflight/common/library create mode 100644 roles/openshift_preflight/common/meta/main.yml (limited to 'roles/openshift_preflight/common') diff --git a/roles/openshift_preflight/common/library b/roles/openshift_preflight/common/library deleted file mode 120000 index ba40d2f56..000000000 --- a/roles/openshift_preflight/common/library +++ /dev/null @@ -1 +0,0 @@ -../../../library \ No newline at end of file diff --git a/roles/openshift_preflight/common/meta/main.yml b/roles/openshift_preflight/common/meta/main.yml new file mode 100644 index 000000000..6f23cbf3b --- /dev/null +++ b/roles/openshift_preflight/common/meta/main.yml @@ -0,0 +1,3 @@ +--- +dependencies: + - role: openshift_preflight/base -- cgit v1.2.3