Browse Source

Ensure ansible_fqdn is set

The ipaclient ansible role requires that ansible_fqdn is defined but
due to [1] we don't have ansible_fqdn inside of ansible_facts.  This
uses the 'fqdn' ansible fact for ansible_fqdn which is equivalent.

[1]: https://opendev.org/openstack/tripleo-heat-templates/commit/4e79336d69e
6b7fa4b026922bac7953bafeee96d

Related-Bug: 1915761
Closes-Bug: 1923248
Change-Id: I0a740e86588c96fff24fa09698c35e492d1c64db
changes/18/785918/5
Dave Wilde (d34dh0r53) 4 weeks ago
committed by Ade Lee
parent
commit
e1998a8e58
2 changed files with 12 additions and 0 deletions
  1. +9
    -0
      deployment/ipa/ipaservices-baremetal-ansible.yaml
  2. +3
    -0
      deployment/tls/undercloud-tls.yaml

+ 9
- 0
deployment/ipa/ipaservices-baremetal-ansible.yaml View File

@ -98,6 +98,9 @@ outputs:
- name: add the ipa services for this node in step 1
when: step|int == 1
block:
- name: Ensure ansible_fqdn is defined
set_fact:
ansible_fqdn: "{{ ansible_facts['fqdn'] }}"
- include_role:
name: tripleo_ipa_registration
vars:
@ -136,6 +139,12 @@ outputs:
ipaclient_install_packages: {get_param: IdMInstallClientPackages}
ipaclients:
- "{{ inventory_hostname }}"
ansible_distribution: "{{ ansible_facts['distribution'] }}"
ansible_distribution_major_version: "{{ ansible_facts['distribution_major_version'] }}"
ansible_distribution_release: "{{ ansible_facts['distribution_release'] }}"
ansible_distribution_version: "{{ ansible_facts['distribution_version'] }}"
ansible_os_family: "{{ ansible_facts['os_family'] }}"
ansible_fqdn: "{{ ipaclient_hostname }}"
-
if:
- idm_server_provided


+ 3
- 0
deployment/tls/undercloud-tls.yaml View File

@ -55,6 +55,9 @@ outputs:
package:
name: openssl-perl
state: present
- name: Ensure ansible_fqdn is defined
set_fact:
ansible_fqdn: "{{ ansible_facts['fqdn'] }}"
- name: Create tripleo-admin user and group
include_role:
name: tripleo_create_admin


Loading…
Cancel
Save