diff options
| author | Michael Gugino <mgugino@redhat.com> | 2017-12-18 16:13:36 -0500 |
|---|---|---|
| committer | Michael Gugino <mgugino@redhat.com> | 2017-12-20 10:13:51 -0500 |
| commit | e6c159afb4ba39a7266c750d43d6a5e911cc8f21 (patch) | |
| tree | 99cb6240e59a7118b2b4c9be603efc7eaeaf4679 /roles/openshift_cli/tasks | |
| parent | a5de165b8e7113631a30ef0e4a20b5f74db073f0 (diff) | |
| download | openshift-e6c159afb4ba39a7266c750d43d6a5e911cc8f21.tar.gz openshift-e6c159afb4ba39a7266c750d43d6a5e911cc8f21.tar.bz2 openshift-e6c159afb4ba39a7266c750d43d6a5e911cc8f21.tar.xz openshift-e6c159afb4ba39a7266c750d43d6a5e911cc8f21.zip | |
Remove openshift.common.{is_atomic|is_containerized}
We set these variables using facts in init, no need
to duplicate the logic all around the codebase.
Diffstat (limited to 'roles/openshift_cli/tasks')
| -rw-r--r-- | roles/openshift_cli/tasks/main.yml | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/roles/openshift_cli/tasks/main.yml b/roles/openshift_cli/tasks/main.yml index 68d82e436..37bed9dbe 100644 --- a/roles/openshift_cli/tasks/main.yml +++ b/roles/openshift_cli/tasks/main.yml @@ -1,7 +1,7 @@ --- - name: Install clients package: name={{ openshift_service_type }}-clients{{ openshift_pkg_version | default('') }} state=present - when: not openshift.common.is_containerized | bool + when: not openshift_is_containerized | bool register: result until: result is succeeded @@ -18,7 +18,7 @@ tag: "{{ openshift_image_tag }}" backend: "docker" when: - - openshift.common.is_containerized | bool + - openshift_is_containerized | bool - not l_use_cli_atomic_image | bool - block: @@ -34,7 +34,7 @@ tag: "{{ openshift_image_tag }}" backend: "atomic" when: - - openshift.common.is_containerized | bool + - openshift_is_containerized | bool - l_use_cli_atomic_image | bool - name: Reload facts to pick up installed OpenShift version @@ -42,6 +42,6 @@ - name: Install bash completion for oc tools package: name=bash-completion state=present - when: not openshift.common.is_containerized | bool + when: not openshift_is_containerized | bool register: result until: result is succeeded |