diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2017-10-10 07:59:24 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-10 07:59:24 -0700 |
| commit | 48126155eade2d030398f69dc5ee32838ec08480 (patch) | |
| tree | 0601f6b220cb4fe8e2d8e6959b49d18aafc1e351 /roles/etcd/templates/etcd.conf.j2 | |
| parent | d3108f4f593a0cb75b206256df37c3f47aed4988 (diff) | |
| parent | 7f20af939e13a7cec3cf56cedd7aa8a302ee58db (diff) | |
| download | openshift-48126155eade2d030398f69dc5ee32838ec08480.tar.gz openshift-48126155eade2d030398f69dc5ee32838ec08480.tar.bz2 openshift-48126155eade2d030398f69dc5ee32838ec08480.tar.xz openshift-48126155eade2d030398f69dc5ee32838ec08480.zip | |
Merge pull request #5585 from nak3/bz#1496593
Automatic merge from submit-queue.
Add valid search when search does not exist on resolv.conf
Current fix https://github.com/openshift/openshift-ansible/pull/5433 still misses to add `search cluster.local`. The logic needs to be:
1. When `search` does not exist, adds `search cluster.local`.
2. When `search.*.cluster.local` does not exist, adds(sed) `cluster.local`.
in this order.
cc @sdodson @caruccio
Diffstat (limited to 'roles/etcd/templates/etcd.conf.j2')
0 files changed, 0 insertions, 0 deletions