summaryrefslogtreecommitdiffstats
path: root/roles/calico/templates
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2017-10-03 07:09:33 -0700
committerGitHub <noreply@github.com>2017-10-03 07:09:33 -0700
commit04a17c28991a7f3c2cdade24b4aed4313616cfec (patch)
treeae26b6ec6ba171436e9250883f8d2f253cf3a85e /roles/calico/templates
parent137e348d4ed1bf3561514009389ae72015d30c8d (diff)
parent893840d7362a845b82e80d2b655b99c95ce60c39 (diff)
downloadopenshift-04a17c28991a7f3c2cdade24b4aed4313616cfec.tar.gz
openshift-04a17c28991a7f3c2cdade24b4aed4313616cfec.tar.bz2
openshift-04a17c28991a7f3c2cdade24b4aed4313616cfec.tar.xz
openshift-04a17c28991a7f3c2cdade24b4aed4313616cfec.zip
Merge pull request #5630 from abutcher/etcd-scaleup-target
Automatic merge from submit-queue. Use etcd_ip when communicating with the cluster as a peer in etcd scaleup. We can't communicate with the hostname here since etcd will be [configured to listen to its IP address](https://github.com/openshift/openshift-ansible/blob/ead22bb1c3b6d6366502b14b97b7aae5605f8a58/roles/etcd/defaults/main.yaml#L69). Fixes https://github.com/openshift/openshift-ansible/issues/5620
Diffstat (limited to 'roles/calico/templates')
0 files changed, 0 insertions, 0 deletions