summaryrefslogtreecommitdiffstats
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
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
-rw-r--r--playbooks/common/openshift-etcd/scaleup.yml2
1 files changed, 1 insertions, 1 deletions
diff --git a/playbooks/common/openshift-etcd/scaleup.yml b/playbooks/common/openshift-etcd/scaleup.yml
index 8aa508119..b5ba2bbba 100644
--- a/playbooks/common/openshift-etcd/scaleup.yml
+++ b/playbooks/common/openshift-etcd/scaleup.yml
@@ -20,7 +20,7 @@
/usr/bin/etcdctl --cert-file {{ etcd_peer_cert_file }}
--key-file {{ etcd_peer_key_file }}
--ca-file {{ etcd_peer_ca_file }}
- -C {{ etcd_peer_url_scheme }}://{{ hostvars[etcd_ca_host].etcd_hostname }}:{{ etcd_client_port }}
+ -C {{ etcd_peer_url_scheme }}://{{ hostvars[etcd_ca_host].etcd_ip }}:{{ etcd_client_port }}
member add {{ etcd_hostname }} {{ etcd_peer_url_scheme }}://{{ etcd_ip }}:{{ etcd_peer_port }}
delegate_to: "{{ etcd_ca_host }}"
failed_when: