diff options
| author | Luke Meyer <lmeyer@redhat.com> | 2017-05-12 15:05:18 -0400 |
|---|---|---|
| committer | Luke Meyer <lmeyer@redhat.com> | 2017-06-06 15:00:23 -0400 |
| commit | 843054c16735da4c292707a5c0cdd28a69df50e5 (patch) | |
| tree | ad862674a84074d563229c5340ffb324c34b4e19 /roles/openshift_excluder | |
| parent | 2d4709b5a65c5bb2777277420ee08f8554efb1ab (diff) | |
| download | openshift-843054c16735da4c292707a5c0cdd28a69df50e5.tar.gz openshift-843054c16735da4c292707a5c0cdd28a69df50e5.tar.bz2 openshift-843054c16735da4c292707a5c0cdd28a69df50e5.tar.xz openshift-843054c16735da4c292707a5c0cdd28a69df50e5.zip | |
singletonize some role tasks that repeat a lot
Diffstat (limited to 'roles/openshift_excluder')
| -rw-r--r-- | roles/openshift_excluder/tasks/install.yml | 36 |
1 files changed, 23 insertions, 13 deletions
diff --git a/roles/openshift_excluder/tasks/install.yml b/roles/openshift_excluder/tasks/install.yml index d09358bee..3a866cedf 100644 --- a/roles/openshift_excluder/tasks/install.yml +++ b/roles/openshift_excluder/tasks/install.yml @@ -1,14 +1,24 @@ --- -- name: Install docker excluder - package: - name: "{{ r_openshift_excluder_service_type }}-docker-excluder{{ openshift_pkg_version | default('') | oo_image_tag_to_rpm_version(include_dash=True) + '*' }}" - state: "{{ r_openshift_excluder_docker_package_state }}" - when: - - r_openshift_excluder_enable_docker_excluder | bool - -- name: Install openshift excluder - package: - name: "{{ r_openshift_excluder_service_type }}-excluder{{ openshift_pkg_version | default('') | oo_image_tag_to_rpm_version(include_dash=True) + '*' }}" - state: "{{ r_openshift_excluder_package_state }}" - when: - - r_openshift_excluder_enable_openshift_excluder | bool + +- when: + - not openshift.common.is_atomic | bool + - r_openshift_excluder_install_ran is not defined + + block: + + - name: Install docker excluder + package: + name: "{{ r_openshift_excluder_service_type }}-docker-excluder{{ openshift_pkg_version | default('') | oo_image_tag_to_rpm_version(include_dash=True) + '*' }}" + state: "{{ r_openshift_excluder_docker_package_state }}" + when: + - r_openshift_excluder_enable_docker_excluder | bool + + - name: Install openshift excluder + package: + name: "{{ r_openshift_excluder_service_type }}-excluder{{ openshift_pkg_version | default('') | oo_image_tag_to_rpm_version(include_dash=True) + '*' }}" + state: "{{ r_openshift_excluder_package_state }}" + when: + - r_openshift_excluder_enable_openshift_excluder | bool + + - set_fact: + r_openshift_excluder_install_ran: True |