diff options
| author | Brenton Leanhardt <bleanhar@redhat.com> | 2016-04-13 10:36:58 -0400 |
|---|---|---|
| committer | Brenton Leanhardt <bleanhar@redhat.com> | 2016-04-14 14:39:26 -0400 |
| commit | c298560ff539d23f60a83876feba83c970283ce7 (patch) | |
| tree | d723e6ea32ad9410d50163049242b3dc5e183c05 /roles/openshift_docker_facts | |
| parent | ee3f0205333840e18c4796e53b0f061fec666333 (diff) | |
| download | openshift-c298560ff539d23f60a83876feba83c970283ce7.tar.gz openshift-c298560ff539d23f60a83876feba83c970283ce7.tar.bz2 openshift-c298560ff539d23f60a83876feba83c970283ce7.tar.xz openshift-c298560ff539d23f60a83876feba83c970283ce7.zip | |
The openshift_docker role must set the version facts for containerized installs
QE found that for fresh installs we were basing the docker version facts of the
images that could be pulled prior to configuring /etc/sysconfig/docker. This
is an edge case but something we need to fix.
Diffstat (limited to 'roles/openshift_docker_facts')
| -rw-r--r-- | roles/openshift_docker_facts/defaults/main.yml | 2 | ||||
| -rw-r--r-- | roles/openshift_docker_facts/tasks/main.yml | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/roles/openshift_docker_facts/defaults/main.yml b/roles/openshift_docker_facts/defaults/main.yml new file mode 100644 index 000000000..7baa87ab8 --- /dev/null +++ b/roles/openshift_docker_facts/defaults/main.yml @@ -0,0 +1,2 @@ +--- +openshift_version: "{{ openshift_image_tag | default(openshift.docker.openshift_image_tag | default('')) }}" diff --git a/roles/openshift_docker_facts/tasks/main.yml b/roles/openshift_docker_facts/tasks/main.yml index 7ea359af1..075dbc145 100644 --- a/roles/openshift_docker_facts/tasks/main.yml +++ b/roles/openshift_docker_facts/tasks/main.yml @@ -49,7 +49,7 @@ when: not openshift.common.is_containerized | bool - set_fact: - l_common_version: "{{ openshift.common.image_tag | default('0.0', True) | oo_image_tag_to_rpm_version }}" + l_common_version: "{{ openshift_version | default('0.0', True) | oo_image_tag_to_rpm_version }}" when: openshift.common.is_containerized | bool - set_fact: |