summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorScott Dodson <sdodson@redhat.com>2017-09-14 14:51:55 -0400
committerGitHub <noreply@github.com>2017-09-14 14:51:55 -0400
commitd37a39d825ad3ccbdccc5c0ad5d35081546a45d6 (patch)
tree6c343798360f45abf67d9bd6978e71e302255bb3
parent4b728ee84b2c0b52a9c8dbf96d04f1bccc5c51e3 (diff)
parent65be0a8f04958037587e7290bd233413f2c58e34 (diff)
downloadopenshift-d37a39d825ad3ccbdccc5c0ad5d35081546a45d6.tar.gz
openshift-d37a39d825ad3ccbdccc5c0ad5d35081546a45d6.tar.bz2
openshift-d37a39d825ad3ccbdccc5c0ad5d35081546a45d6.tar.xz
openshift-d37a39d825ad3ccbdccc5c0ad5d35081546a45d6.zip
Merge pull request #5396 from abutcher/etcd-migrate-openshift-ip
Use openshift.common.ip rather than ansible_default_ipv4 in etcd migration playbook.
-rw-r--r--playbooks/common/openshift-etcd/migrate.yml6
1 files changed, 3 insertions, 3 deletions
diff --git a/playbooks/common/openshift-etcd/migrate.yml b/playbooks/common/openshift-etcd/migrate.yml
index a2af7bb21..e4ab0aa41 100644
--- a/playbooks/common/openshift-etcd/migrate.yml
+++ b/playbooks/common/openshift-etcd/migrate.yml
@@ -69,7 +69,7 @@
- role: etcd_migrate
r_etcd_migrate_action: migrate
r_etcd_common_embedded_etcd: "{{ groups.oo_etcd_to_config | default([]) | length == 0 }}"
- etcd_peer: "{{ ansible_default_ipv4.address }}"
+ etcd_peer: "{{ openshift.common.ip }}"
etcd_url_scheme: "https"
etcd_peer_url_scheme: "https"
@@ -80,7 +80,7 @@
- role: etcd_migrate
r_etcd_migrate_action: clean_data
r_etcd_common_embedded_etcd: "{{ groups.oo_etcd_to_config | default([]) | length == 0 }}"
- etcd_peer: "{{ ansible_default_ipv4.address }}"
+ etcd_peer: "{{ openshift.common.ip }}"
etcd_url_scheme: "https"
etcd_peer_url_scheme: "https"
post_tasks:
@@ -115,7 +115,7 @@
roles:
- role: etcd_migrate
r_etcd_migrate_action: add_ttls
- etcd_peer: "{{ hostvars[groups.oo_etcd_to_migrate.0].ansible_default_ipv4.address }}"
+ etcd_peer: "{{ hostvars[groups.oo_etcd_to_migrate.0].openshift.common.ip }}"
etcd_url_scheme: "https"
etcd_peer_url_scheme: "https"
when: etcd_migration_failed | length == 0