From c08de05fbdd65f9fd36fdd721e260328b9c69248 Mon Sep 17 00:00:00 2001 From: Jerry Vonau Date: Thu, 9 Nov 2017 06:44:00 -0600 Subject: [PATCH] shift FQDN --- roles/2-common/tasks/hostname.yml | 21 --------------------- roles/network/tasks/main.yml | 25 ++++++++++++++++++++++++- 2 files changed, 24 insertions(+), 22 deletions(-) diff --git a/roles/2-common/tasks/hostname.yml b/roles/2-common/tasks/hostname.yml index 2a09b0d2b..4726ec306 100644 --- a/roles/2-common/tasks/hostname.yml +++ b/roles/2-common/tasks/hostname.yml @@ -18,27 +18,6 @@ group=root mode=0644 -- name: Configuring named - include_tasks: roles/network/tasks/named.yml - tags: - - named - - network - - domain - -- name: Configuring dhcpd - include_tasks: roles/network/tasks/dhcpd.yml - tags: - - dhcpd - - network - - domain - -- name: Configuring Squid - include_tasks: roles/network/tasks/squid.yml - when: squid_install - tags: - - squid - - network - - name: Re-configuring httpd - not initial install include_tasks: roles/httpd/tasks/main.yml when: iiab_stage|int > 3 diff --git a/roles/network/tasks/main.yml b/roles/network/tasks/main.yml index d52c088fc..dd80f1638 100644 --- a/roles/network/tasks/main.yml +++ b/roles/network/tasks/main.yml @@ -19,12 +19,35 @@ # when: 'iiab_wan_iface != "none" and wan_ip != "dhcp"' ##### End static ip address info -- include_tasks: roles/network/tasks/wondershaper.yml +- include_tasks: wondershaper.yml tags: - wondershaper - network when: wondershaper_install +- name: Configuring named + include_tasks: named.yml + when: FQDN_changed + tags: + - named + - network + - domain + +- name: Configuring dhcpd + include_tasks: dhcpd.yml + when: FQDN_changed + tags: + - dhcpd + - network + - domain + +- name: Configuring Squid + include_tasks: squid.yml + when: squid_install and FQDN_changed + tags: + - squid + - network + - include_tasks: hosts.yml tags: - network