From e8bb95a33adb227876d22ea95e5bc82bb1743455 Mon Sep 17 00:00:00 2001 From: Jerry Vonau Date: Sun, 5 Nov 2017 13:54:26 -0600 Subject: [PATCH] (re)install named, dhcpd, squid when FQDN changes --- roles/2-common/tasks/hostname.yml | 21 +++++++++++++++++++++ roles/2-common/tasks/main.yml | 10 +++++----- roles/3-base-server/tasks/main.yml | 18 ------------------ 3 files changed, 26 insertions(+), 23 deletions(-) diff --git a/roles/2-common/tasks/hostname.yml b/roles/2-common/tasks/hostname.yml index a4e400924..961add87d 100644 --- a/roles/2-common/tasks/hostname.yml +++ b/roles/2-common/tasks/hostname.yml @@ -17,3 +17,24 @@ owner=root 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 diff --git a/roles/2-common/tasks/main.yml b/roles/2-common/tasks/main.yml index f7c0cc95b..c23b33521 100644 --- a/roles/2-common/tasks/main.yml +++ b/roles/2-common/tasks/main.yml @@ -12,11 +12,11 @@ when: xo_model != "none" or osbuilder is defined # set FQDN for IIAB -- include_tasks: hostname.yml - tags: - - network - - domain - - hostname +#- include_tasks: hostname.yml +# tags: +# - network +# - domain +# - hostname - include_tasks: centos.yml when: ansible_distribution == "CentOS" diff --git a/roles/3-base-server/tasks/main.yml b/roles/3-base-server/tasks/main.yml index 6729c5597..c83eaa0a0 100644 --- a/roles/3-base-server/tasks/main.yml +++ b/roles/3-base-server/tasks/main.yml @@ -20,24 +20,6 @@ # has no "when: XXXXX_install" flag tags: base, mysql -- include_tasks: roles/network/tasks/named.yml - tags: - - named - - network - - domain - -- include_tasks: roles/network/tasks/dhcpd.yml - tags: - - dhcpd - - network - - domain - -- include_tasks: roles/network/tasks/squid.yml - tags: - - squid - - network - when: squid_install - - include_tasks: roles/network/tasks/wondershaper.yml tags: - wondershaper