summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2018-02-12 19:06:28 -0800
committerGitHub <noreply@github.com>2018-02-12 19:06:28 -0800
commitb86082b1c5cdd78c85e33ec51e5dab71f36aad0d (patch)
tree249ccd87fad6876e0eae3c524ce5388f93123605
parentcf6d85fca0d42466f42b64cf205e83e7f1586369 (diff)
parentbdf26bb9c19b920244b9fcdc4fffe1e07477650b (diff)
downloadopenshift-b86082b1c5cdd78c85e33ec51e5dab71f36aad0d.tar.gz
openshift-b86082b1c5cdd78c85e33ec51e5dab71f36aad0d.tar.bz2
openshift-b86082b1c5cdd78c85e33ec51e5dab71f36aad0d.tar.xz
openshift-b86082b1c5cdd78c85e33ec51e5dab71f36aad0d.zip
Merge pull request #7119 from vrutkovs/etcd-scaleup-ansible-name
Automatic merge from submit-queue. etcd_scaleup: use inventory_hostname when etcd ca host is being picked This would fix etcd scaleup playbook when inventory uses custom hostnames, e.g.: ``` new_etcd: hosts: new-etcd-node: ansible_host: ec2-54-173-186-97.compute-1.amazonaws.com ```
-rw-r--r--roles/openshift_etcd_facts/tasks/set_etcd_ca_host.yml4
1 files changed, 2 insertions, 2 deletions
diff --git a/roles/openshift_etcd_facts/tasks/set_etcd_ca_host.yml b/roles/openshift_etcd_facts/tasks/set_etcd_ca_host.yml
index bf8d28a9b..624ad714e 100644
--- a/roles/openshift_etcd_facts/tasks/set_etcd_ca_host.yml
+++ b/roles/openshift_etcd_facts/tasks/set_etcd_ca_host.yml
@@ -14,10 +14,10 @@
# and /etc/etcd/generated_certs directories.
- set_fact:
__etcd_ca_dir_hosts: "{{ __etcd_ca_host_stat.results
- | lib_utils_oo_collect('_ansible_delegated_vars.ansible_host',
+ | lib_utils_oo_collect('_ansible_delegated_vars.inventory_hostname',
filters={'stat.path':'/etc/etcd/ca','stat.exists':True}) }}"
__etcd_generated_certs_dir_hosts: "{{ __etcd_ca_host_stat.results
- | lib_utils_oo_collect('_ansible_delegated_vars.ansible_host',
+ | lib_utils_oo_collect('_ansible_delegated_vars.inventory_hostname',
filters={'stat.path':'/etc/etcd/generated_certs','stat.exists':True}) }}"
run_once: true