From 2550eb4d04253e2b3181b3df8c0e342cadef7db2 Mon Sep 17 00:00:00 2001 From: Jerry Vonau Date: Wed, 16 Jan 2019 03:32:04 -0600 Subject: [PATCH 1/2] Don't auto reinstall named, dhcpd when install is False Trigger is change in hostname away from what is set in local_vars. --- roles/network/tasks/main.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/roles/network/tasks/main.yml b/roles/network/tasks/main.yml index 3d8473888..13b975d75 100644 --- a/roles/network/tasks/main.yml +++ b/roles/network/tasks/main.yml @@ -64,15 +64,15 @@ - name: (Re)Installing named include_tasks: named.yml - when: FQDN_changed and iiab_stage|int == 9 + when: named_install and FQDN_changed and iiab_stage|int == 9 - name: (Re)Installing dhcpd include_tasks: dhcpd.yml - when: FQDN_changed and iiab_stage|int == 9 + when: dhcpd_install and FQDN_changed and iiab_stage|int == 9 - name: (Re)Installing Squid include_tasks: squid.yml - when: FQDN_changed and squid_install and iiab_stage|int == 9 + when: squid_install and FQDN_changed and iiab_stage|int == 9 #### start services - include_tasks: avahi.yml From 63fda2b2908b6764c51a6bda5b30e14e1b3a80ff Mon Sep 17 00:00:00 2001 From: A Holt Date: Wed, 16 Jan 2019 04:49:30 -0500 Subject: [PATCH 2/2] Update main.yml --- roles/network/tasks/main.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/roles/network/tasks/main.yml b/roles/network/tasks/main.yml index 13b975d75..1d8101a7e 100644 --- a/roles/network/tasks/main.yml +++ b/roles/network/tasks/main.yml @@ -55,22 +55,22 @@ - hostname - domain -- name: Configuring wondershaper +- name: Configure wondershaper include_tasks: wondershaper.yml when: wondershaper_install tags: - network - wondershaper -- name: (Re)Installing named +- name: (Re)Install named include_tasks: named.yml when: named_install and FQDN_changed and iiab_stage|int == 9 -- name: (Re)Installing dhcpd +- name: (Re)Install dhcpd include_tasks: dhcpd.yml when: dhcpd_install and FQDN_changed and iiab_stage|int == 9 -- name: (Re)Installing Squid +- name: (Re)Install Squid include_tasks: squid.yml when: squid_install and FQDN_changed and iiab_stage|int == 9 @@ -104,7 +104,7 @@ tags: - network -- name: Netplan in use on ubuntu 18 +- name: Netplan in use on Ubuntu 18 include_tasks: netplan.yml when: is_ubuntu_18 #and not installing