diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2017-10-03 22:14:27 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-03 22:14:27 -0700 |
| commit | a25709a6f16913b59ef2edc3e07d8bc8a598f41e (patch) | |
| tree | a307711679d4c25899b58ba2761fc09349bfd66e /roles/docker/templates/crio.conf.j2 | |
| parent | 28c69cef6753079f3e26d59159d58434eb397cfc (diff) | |
| parent | 4b0f5219f4ec3eeb5433fc9f985b1e067b581276 (diff) | |
| download | openshift-a25709a6f16913b59ef2edc3e07d8bc8a598f41e.tar.gz openshift-a25709a6f16913b59ef2edc3e07d8bc8a598f41e.tar.bz2 openshift-a25709a6f16913b59ef2edc3e07d8bc8a598f41e.tar.xz openshift-a25709a6f16913b59ef2edc3e07d8bc8a598f41e.zip | |
Merge pull request #5641 from mgugino-upstream-stage/fix-hosted-selectors
Automatic merge from submit-queue.
Fix hosted selector variable migration
Currently, if undefined, openshift_hosted_router_selector and
openshift_hosted_registry_selector as set to the value
of openshift_hosted_infra_selector.
The set_fact logic overrides variable migration inside of
oo_filters meant to utilize the deprecated variables
openshift_router_selector and openshift_registiry_selector,
respectively.
This commit corrects the set_fact logic and removes the
unused migration from oo_filters.
Fixes: https://github.com/openshift/openshift-ansible/issues/5615
Diffstat (limited to 'roles/docker/templates/crio.conf.j2')
0 files changed, 0 insertions, 0 deletions