diff options
| author | Jan Pazdziora <jpazdziora@redhat.com> | 2017-11-22 16:36:14 +0100 |
|---|---|---|
| committer | Jan Pazdziora <jpazdziora@redhat.com> | 2017-11-22 16:38:17 +0100 |
| commit | e3a0867b67b3f83e1077f112f07ecbaf8236e173 (patch) | |
| tree | 8dc989e973124ac8e05a6a859b0227e471b0973e | |
| parent | 21823fcfbe1a435264c3574806c6f38dd8ddc57f (diff) | |
| download | openshift-e3a0867b67b3f83e1077f112f07ecbaf8236e173.tar.gz openshift-e3a0867b67b3f83e1077f112f07ecbaf8236e173.tar.bz2 openshift-e3a0867b67b3f83e1077f112f07ecbaf8236e173.tar.xz openshift-e3a0867b67b3f83e1077f112f07ecbaf8236e173.zip | |
With dnf repoquery and excluded packages, --disableexcludes=all is needed to list the package with --installed.
| -rw-r--r-- | playbooks/common/openshift-cluster/upgrades/docker/upgrade_check.yml | 2 | ||||
| -rw-r--r-- | playbooks/init/facts.yml | 1 | ||||
| -rw-r--r-- | roles/docker/tasks/package_docker.yml | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/playbooks/common/openshift-cluster/upgrades/docker/upgrade_check.yml b/playbooks/common/openshift-cluster/upgrades/docker/upgrade_check.yml index 52345a9ba..2e3a7ae8b 100644 --- a/playbooks/common/openshift-cluster/upgrades/docker/upgrade_check.yml +++ b/playbooks/common/openshift-cluster/upgrades/docker/upgrade_check.yml @@ -16,7 +16,7 @@ changed_when: no - name: Get current version of Docker - command: "{{ repoquery_cmd }} --installed --qf '%{version}' docker" + command: "{{ repoquery_installed }} --qf '%{version}' docker" register: curr_docker_version retries: 4 until: curr_docker_version | succeeded diff --git a/playbooks/init/facts.yml b/playbooks/init/facts.yml index c9a3448c7..9fb4ad951 100644 --- a/playbooks/init/facts.yml +++ b/playbooks/init/facts.yml @@ -154,6 +154,7 @@ - name: initialize_facts set_fact repoquery command set_fact: repoquery_cmd: "{{ 'dnf repoquery --latest-limit 1 -d 0' if ansible_pkg_mgr == 'dnf' else 'repoquery --plugins' }}" + repoquery_installed: "{{ 'dnf repoquery --latest-limit 1 -d 0 --disableexcludes=all --installed' if ansible_pkg_mgr == 'dnf' else 'repoquery --plugins --installed' }}" - name: initialize_facts set_fact on openshift_docker_hosted_registry_network set_fact: diff --git a/roles/docker/tasks/package_docker.yml b/roles/docker/tasks/package_docker.yml index e6c3fe4d7..06ba36d59 100644 --- a/roles/docker/tasks/package_docker.yml +++ b/roles/docker/tasks/package_docker.yml @@ -1,6 +1,6 @@ --- - name: Get current installed Docker version - command: "{{ repoquery_cmd }} --installed --qf '%{version}' docker" + command: "{{ repoquery_installed }} --qf '%{version}' docker" when: not openshift.common.is_atomic | bool register: curr_docker_version retries: 4 |