diff options
| author | Scott Dodson <sdodson@redhat.com> | 2017-03-20 16:19:13 -0400 |
|---|---|---|
| committer | Scott Dodson <sdodson@redhat.com> | 2017-03-20 16:19:13 -0400 |
| commit | 0dc62b7550980a0627cb15796be3746f6a924a7d (patch) | |
| tree | a824bef2ab1e10f4bed3d67d98ed3fd2aa51b2bf | |
| parent | 36b7f1bb7b036d619f224594c4fc08ed2b434a80 (diff) | |
| download | openshift-0dc62b7550980a0627cb15796be3746f6a924a7d.tar.gz openshift-0dc62b7550980a0627cb15796be3746f6a924a7d.tar.bz2 openshift-0dc62b7550980a0627cb15796be3746f6a924a7d.tar.xz openshift-0dc62b7550980a0627cb15796be3746f6a924a7d.zip | |
Attempt to match version of excluders to target version
| -rw-r--r-- | playbooks/common/openshift-cluster/disable_excluder.yml | 2 | ||||
| -rw-r--r-- | roles/openshift_excluder/tasks/install.yml | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/playbooks/common/openshift-cluster/disable_excluder.yml b/playbooks/common/openshift-cluster/disable_excluder.yml index 68bffb5f5..f664c51c9 100644 --- a/playbooks/common/openshift-cluster/disable_excluder.yml +++ b/playbooks/common/openshift-cluster/disable_excluder.yml @@ -1,5 +1,5 @@ --- -- name: Record excluder state and disable +- name: Disable excluders hosts: oo_masters_to_config:oo_nodes_to_config gather_facts: no tasks: diff --git a/roles/openshift_excluder/tasks/install.yml b/roles/openshift_excluder/tasks/install.yml index dcc8df0cb..3490a613e 100644 --- a/roles/openshift_excluder/tasks/install.yml +++ b/roles/openshift_excluder/tasks/install.yml @@ -6,14 +6,14 @@ - name: Install docker excluder package: - name: "{{ openshift.common.service_type }}-docker-excluder" + name: "{{ openshift.common.service_type }}-docker-excluder{{ openshift_pkg_version | default('') | oo_image_tag_to_rpm_version(include_dash=True) + '*' }}" state: "{{ docker_excluder_package_state }}" when: - install_docker_excluder | default(true) | bool - name: Install openshift excluder package: - name: "{{ openshift.common.service_type }}-excluder" + name: "{{ openshift.common.service_type }}-excluder{{ openshift_pkg_version | default('') | oo_image_tag_to_rpm_version(include_dash=True) + '*' }}" state: "{{ openshift_excluder_package_state }}" when: - install_openshift_excluder | default(true) | bool |