openstack
/
tripleo-ansible
Code Issues Proposed changes

Merge "Use ansible_facts in tripleo_ssh_known_hosts role"

This commit is contained in:
Zuul 2021-04-14 18:46:46 +00:00 committed by Gerrit Code Review
parent 3ffe69958b 30df6f5437
commit 4cf8112b26
5 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
tripleo_ansible/roles/tripleo_ssh_known_hosts/molecule/default/converge.yml
View File

@ -18,5 +18,8 @@
- name: Converge
hosts: all
pre_tasks:
- name: Override ssh_host_key_rsa_public test value in ansible_facts
set_fact:
ansible_facts: "{{ ansible_facts|combine({'ssh_host_key_rsa_public': 'AAAATEST'}) }}"
roles:
- role: "tripleo_ssh_known_hosts"

1
tripleo_ansible/roles/tripleo_ssh_known_hosts/molecule/default/molecule.yml
View File

@ -35,7 +35,6 @@ provisioner:
allovercloud:
hosts:
ubi8:
ansible_ssh_host_key_rsa_public: AAAATEST
ctlplane_ip: 10.0.0.1
ctlplane_hostname: ubi8.ctlplane.localdomain
internal_api_ip: 10.0.1.1

3
tripleo_ansible/roles/tripleo_ssh_known_hosts/molecule/no_networks/converge.yml
View File

@ -18,5 +18,8 @@
- name: Converge
hosts: all
pre_tasks:
- name: Override ssh_host_key_rsa_public test value in ansible_facts
set_fact:
ansible_facts: "{{ ansible_facts|combine({'ssh_host_key_rsa_public': 'AAAATEST'}) }}"
roles:
- role: "tripleo_ssh_known_hosts"

1
tripleo_ansible/roles/tripleo_ssh_known_hosts/molecule/no_networks/molecule.yml
View File

@ -35,7 +35,6 @@ provisioner:
allovercloud:
hosts:
ubi8:
ansible_ssh_host_key_rsa_public: AAAATEST
log: true
env:
ANSIBLE_STDOUT_CALLBACK: yaml

4
tripleo_ansible/roles/tripleo_ssh_known_hosts/tasks/main.yml
View File

@ -49,7 +49,7 @@
ssh_known_hosts_lines: |-
{% for host in groups['allovercloud'] | intersect(play_hosts) %}
{% set hostdata = hostvars[host] %}
{% if 'ansible_ssh_host_key_rsa_public' in hostdata %}
{% if 'ssh_host_key_rsa_public' in hostdata['ansible_facts'] %}
{% set entries = [] %}
{% set enabled_host_networks = hostdata['tripleo_role_networks']|default([]) %}
{% for network in enabled_host_networks %}
@ -64,7 +64,7 @@
{% set _ = entries.append('[' ~ hostdata['canonical_hostname'] ~ ']*') %}
{% endif %}
{% set _ = entries.append('[' ~ host ~ ']*') %}
{% set line = entries|unique|join(',') ~ ' ssh-rsa ' ~ hostdata['ansible_ssh_host_key_rsa_public'] %}
{% set line = entries|unique|join(',') ~ ' ssh-rsa ' ~ hostdata['ansible_facts']['ssh_host_key_rsa_public'] %}
{{ line }}
{% endif %}
{% endfor %}