diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2017-10-09 16:00:25 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-09 16:00:25 -0700 |
| commit | 8d9dcffb4c3b4e64c6397111a480633df951c39e (patch) | |
| tree | 28ec16fa566bb512956c1b71ed6258b60a52fd3a /roles/calico/templates/10-calico.conf.j2 | |
| parent | 60c770af09aaf5572b61d6d71ddda88db2dd7de2 (diff) | |
| parent | cc4fc9acc92839ac9eded80485d047b77abe19de (diff) | |
| download | openshift-8d9dcffb4c3b4e64c6397111a480633df951c39e.tar.gz openshift-8d9dcffb4c3b4e64c6397111a480633df951c39e.tar.bz2 openshift-8d9dcffb4c3b4e64c6397111a480633df951c39e.tar.xz openshift-8d9dcffb4c3b4e64c6397111a480633df951c39e.zip | |
Merge pull request #5695 from giuseppe/image_tag_default_to_release
Automatic merge from submit-queue.
docker, CRI-O: openshift_image_tag defaults to openshift_release
Replace:
commit c2c4ba7ec62d4dfd87d746d20991e10f2bd1bddf
Author: Giuseppe Scrivano <gscrivan@redhat.com>
Date: Tue Sep 26 09:01:59 2017 +0200
Require openshift_image_tag in the inventory with openshift-enterprise
Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
with using openshift_release for openshift_image_tag so we don't require users to include both in their inventory. Probably it is only a temporary solution until the openshift_image_tag vs openshift_release when using Docker/CRI-O is sorted out.
Closes: https://bugzilla.redhat.com/show_bug.cgi?id=1493376
Diffstat (limited to 'roles/calico/templates/10-calico.conf.j2')
0 files changed, 0 insertions, 0 deletions