Skip to content

Commit

Permalink
Merge pull request #7119 from vrutkovs/etcd-scaleup-ansible-name
Browse files Browse the repository at this point in the history
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
```
  • Loading branch information
openshift-merge-robot authored Feb 13, 2018
2 parents cf6d85f + bdf26bb commit b86082b
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions roles/openshift_etcd_facts/tasks/set_etcd_ca_host.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down

0 comments on commit b86082b

Please sign in to comment.