diff options
| author | OpenShift Bot <eparis+openshiftbot@redhat.com> | 2017-06-14 16:10:54 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-14 16:10:54 -0400 |
| commit | 4f129045b3f3c1b22203a7ab68cda15ee4b8d87b (patch) | |
| tree | cad723b79faa4dfc78c7f3cb73d871e9f4ab95a3 /roles/openshift_excluder | |
| parent | cf81c53e8b747603ba6599f8c9fbdf50feff4c88 (diff) | |
| parent | 843054c16735da4c292707a5c0cdd28a69df50e5 (diff) | |
| download | openshift-4f129045b3f3c1b22203a7ab68cda15ee4b8d87b.tar.gz openshift-4f129045b3f3c1b22203a7ab68cda15ee4b8d87b.tar.bz2 openshift-4f129045b3f3c1b22203a7ab68cda15ee4b8d87b.tar.xz openshift-4f129045b3f3c1b22203a7ab68cda15ee4b8d87b.zip | |
Merge pull request #4179 from sosiouxme/20170512-singletonize-slow-stuff
Merged by openshift-bot
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 |