openstack
/
tripleo-validations
Code Issues Proposed changes

Merge "Make tls_everywhere validations compatible with ansible_facts"

This commit is contained in:
Zuul 2021-04-26 23:49:13 +00:00 committed by Gerrit Code Review
parent bbe326a6e4 b63d45a2c6
commit 231bed4770
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
roles/tls_everywhere/tasks/common.yaml
View File

@ -133,7 +133,7 @@
- name: Set fact for IdM/FreeIPA host entry
set_fact:
host_entry: "{{ ansible_fqdn }}@{{ ipa_realm.value }}"
host_entry: "{{ ansible_facts['fqdn'] }}@{{ ipa_realm.value }}"
when: ipa_conf_stat.stat.exists
- name: Set fact for IdM/FreeIPA host principal

4
roles/tls_everywhere/tasks/ipa-server-check.yaml
View File

@ -23,7 +23,7 @@
# This playbook contains the following parameters
# - tls_everywhere_check_dns_aci - which determines if we want to check
# for the DNS ACI. This defaults to true.
# - tls_everywhere_undercloud_fqdn - which defaults to ansible_fqdn
# - tls_everywhere_undercloud_fqdn - which defaults to ansible_facts['fqdn']
- name: check if undercloud is an ipa client
stat:
@ -34,7 +34,7 @@
when: ipa_default_conf.stat.exists
vars:
check_dns_aci: "{{ tls_everywhere_check_dns_aci | default(True)}}"
undercloud_fqdn: "{{ tls_everywhere_undercloud_fqdn | default(ansible_fqdn) }}"
undercloud_fqdn: "{{ tls_everywhere_undercloud_fqdn | default(ansible_facts['fqdn']) }}"
ipa_server_aci_check_failures: []
fail_1: >-
The IPA server does not have the required ACI to allow host