diff --git a/roles/0-init/tasks/network.yml b/roles/0-init/tasks/network.yml index 4680672a0..6a1a04cef 100644 --- a/roles/0-init/tasks/network.yml +++ b/roles/0-init/tasks/network.yml @@ -46,15 +46,18 @@ iiab_fqdn: "{{ iiab_hostname }}.{{ iiab_domain }}" FQDN_changed: False -- name: "Set 'FQDN_changed: True' when iiab_fqdn != ansible_fqdn ({{ ansible_fqdn }})" +- name: Set hostname in various places -- if iiab_fqdn != ansible_fqdn ({{ ansible_fqdn }}) + include_tasks: hostname.yml + when: iiab_fqdn != ansible_fqdn + +# 2021-07-30: FQDN_changed isn't used as in the past -- its remaining use is +# for {named, dhcpd, squid} in roles/network/tasks/main.yml -- possibly it +# should be reconsidered? See PR #2876: roles/network might become optional? +- name: "Also set 'FQDN_changed: True' -- if iiab_fqdn != ansible_fqdn ({{ ansible_fqdn }})" set_fact: FQDN_changed: True when: iiab_fqdn != ansible_fqdn -- name: Set hostname if FQDN_changed - include_tasks: hostname.yml - when: FQDN_changed - - name: "Set 'gui_port: 80' for Admin Console if not adm_cons_force_ssl" set_fact: