diff options
| author | Rodolfo Carvalho <rhcarvalho@gmail.com> | 2017-01-12 18:30:24 +0100 |
|---|---|---|
| committer | Rodolfo Carvalho <rhcarvalho@gmail.com> | 2017-01-12 18:30:24 +0100 |
| commit | c4aec0fbd112fd1c8503e935ac954da268a2fdff (patch) | |
| tree | 685ee12de8fa71f89813484e42181344f6728512 | |
| parent | 3c6b9fe8641c067f2f010d637b69e4e84b94017b (diff) | |
| download | openshift-c4aec0fbd112fd1c8503e935ac954da268a2fdff.tar.gz openshift-c4aec0fbd112fd1c8503e935ac954da268a2fdff.tar.bz2 openshift-c4aec0fbd112fd1c8503e935ac954da268a2fdff.tar.xz openshift-c4aec0fbd112fd1c8503e935ac954da268a2fdff.zip | |
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.
| -rw-r--r-- | playbooks/byo/openshift-preflight/check.yml | 1 | ||||
| -rw-r--r-- | roles/openshift_preflight/common/tasks/main.yml | 3 | ||||
| -rw-r--r-- | roles/openshift_preflight/facts/meta/main.yml | 3 | ||||
| -rw-r--r-- | roles/openshift_preflight/facts/tasks/main.yml | 3 | ||||
| -rw-r--r-- | roles/openshift_preflight/masters/tasks/main.yml | 3 | ||||
| -rw-r--r-- | roles/openshift_preflight/nodes/tasks/main.yml | 3 |
6 files changed, 6 insertions, 10 deletions
diff --git a/playbooks/byo/openshift-preflight/check.yml b/playbooks/byo/openshift-preflight/check.yml index 460ba4ce4..94f53eb84 100644 --- a/playbooks/byo/openshift-preflight/check.yml +++ b/playbooks/byo/openshift-preflight/check.yml @@ -1,6 +1,5 @@ --- - hosts: OSEv3 - gather_facts: no roles: - openshift_preflight/facts 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 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([]) }}" diff --git a/roles/openshift_preflight/masters/tasks/main.yml b/roles/openshift_preflight/masters/tasks/main.yml index ed42f69fa..80d7af208 100644 --- a/roles/openshift_preflight/masters/tasks/main.yml +++ b/roles/openshift_preflight/masters/tasks/main.yml @@ -1,7 +1,6 @@ --- # determine if yum install of master pkgs will work -- when: - - not containerized +- when: not openshift.common.is_containerized | bool block: - name: main packages for enterprise diff --git a/roles/openshift_preflight/nodes/tasks/main.yml b/roles/openshift_preflight/nodes/tasks/main.yml index 16c7212d4..c98b02bf5 100644 --- a/roles/openshift_preflight/nodes/tasks/main.yml +++ b/roles/openshift_preflight/nodes/tasks/main.yml @@ -1,7 +1,6 @@ --- # determine if yum install of node pkgs will work -- when: - - not containerized +- when: not openshift.common.is_containerized | bool block: - name: main packages for enterprise |