diff options
| author | Brenton Leanhardt <bleanhar@redhat.com> | 2016-04-15 10:24:59 -0400 |
|---|---|---|
| committer | Brenton Leanhardt <bleanhar@redhat.com> | 2016-04-15 10:24:59 -0400 |
| commit | dbb94c4e5461780adb74e864e6b0919153b5ffe7 (patch) | |
| tree | a2be6d3e8f107bfea0d016d900dbd262cce98baa /roles/openshift_master/defaults | |
| parent | a9893ab91495a7b5530648191291bcb9de9cd291 (diff) | |
| parent | 2342cb2f47050d430ff7fb07e68e9e42006884eb (diff) | |
| download | openshift-dbb94c4e5461780adb74e864e6b0919153b5ffe7.tar.gz openshift-dbb94c4e5461780adb74e864e6b0919153b5ffe7.tar.bz2 openshift-dbb94c4e5461780adb74e864e6b0919153b5ffe7.tar.xz openshift-dbb94c4e5461780adb74e864e6b0919153b5ffe7.zip | |
Merge pull request #1746 from brenton/docker1
The openshift_docker role must set the version facts for containerize…
Diffstat (limited to 'roles/openshift_master/defaults')
| -rw-r--r-- | roles/openshift_master/defaults/main.yml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/roles/openshift_master/defaults/main.yml b/roles/openshift_master/defaults/main.yml index afc81a414..6bf28ff2b 100644 --- a/roles/openshift_master/defaults/main.yml +++ b/roles/openshift_master/defaults/main.yml @@ -29,4 +29,4 @@ os_firewall_deny: - service: former etcd peer port port: 7001/tcp -openshift_version: "{{ openshift_pkg_version | default(openshift_image_tag) | default(openshift.common.image_tag) | default('') }}" +openshift_version: "{{ openshift_pkg_version | default(openshift_image_tag | default(openshift.docker.openshift_image_tag | default(''))) }}" |