Browse Source

Merge "Ensure ansible_fqdn is set" into stable/ussuri

changes/99/786699/1
Zuul 6 months ago
committed by Gerrit Code Review
parent
commit
20368b2df2
  1. 9
      deployment/ipa/ipaservices-baremetal-ansible.yaml
  2. 3
      deployment/tls/undercloud-tls.yaml

9
deployment/ipa/ipaservices-baremetal-ansible.yaml

@ -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
deployment/tls/undercloud-tls.yaml

@ -59,6 +59,9 @@ outputs:
package:
name: ipa-client
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