Merge "Use ANSIBLE_PRIVATE_KEY_FILE when adding hosts to inventory"
This commit is contained in:
commit
b03e6bcff0
|
@ -188,7 +188,7 @@
|
||||||
user_public_key: "{{ user_public_key }}"
|
user_public_key: "{{ user_public_key }}"
|
||||||
user_private_key: "{{ user_private_key }}"
|
user_private_key: "{{ user_private_key }}"
|
||||||
user_private_key_file: "{{ user_private_key_file }}"
|
user_private_key_file: "{{ user_private_key_file }}"
|
||||||
ansible_ssh_private_key_file: "{{ ansible_home }}/.ssh/id_rsa"
|
ansible_ssh_private_key_file: "{{ lookup('env', 'ANSIBLE_PRIVATE_KEY_FILE') | default(ansible_home ~ '/.ssh/id_rsa') }}"
|
||||||
changed_when: false
|
changed_when: false
|
||||||
loop: '{{ set_ssh_servers | difference(((BlacklistedIpAddresses | length) < 1) | ternary([], BlacklistedIpAddresses)) }}'
|
loop: '{{ set_ssh_servers | difference(((BlacklistedIpAddresses | length) < 1) | ternary([], BlacklistedIpAddresses)) }}'
|
||||||
|
|
||||||
|
@ -198,7 +198,6 @@
|
||||||
user: "{{ ssh_user | default('heat-admin') }}"
|
user: "{{ ssh_user | default('heat-admin') }}"
|
||||||
become: true
|
become: true
|
||||||
any_errors_fatal: true
|
any_errors_fatal: true
|
||||||
strategy: free
|
|
||||||
roles:
|
roles:
|
||||||
- role: tripleo_create_admin
|
- role: tripleo_create_admin
|
||||||
tripleo_admin_user: tripleo-admin
|
tripleo_admin_user: tripleo-admin
|
||||||
|
|
Loading…
Reference in New Issue