From 6c6f8feb2604d2e7d75c13473692d58bb0a6e831 Mon Sep 17 00:00:00 2001 From: Dick Visser Date: Fri, 4 May 2018 15:22:41 +0200 Subject: [PATCH 1/2] test --- CHANGELOG | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 CHANGELOG diff --git a/CHANGELOG b/CHANGELOG new file mode 100644 index 00000000..e69de29b From 09fc9a3678722c9feababfaa9042cd93235e7d01 Mon Sep 17 00:00:00 2001 From: Dick Visser Date: Fri, 4 May 2018 16:33:57 +0200 Subject: [PATCH 2/2] New var `networkmanager` that prevents disabling NetworkManager on hosts that need it. --- environments/template/group_vars/all.yml | 2 ++ roles/common/tasks/main.yml | 9 ++++++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/environments/template/group_vars/all.yml b/environments/template/group_vars/all.yml index 280b81a1..c32732d1 100644 --- a/environments/template/group_vars/all.yml +++ b/environments/template/group_vars/all.yml @@ -26,6 +26,8 @@ server_admin_email: admin@stepup.example.com noreply_email: noreply@stepup.example.com noreply_email_name: Step-up Example +# Keep using NetworkManager (default will be disabled) +# networkmanager: yes # FQDN for vhosts # These are the hostnames for the stepup web applications. # diff --git a/roles/common/tasks/main.yml b/roles/common/tasks/main.yml index 0ced5e69..e16979c8 100644 --- a/roles/common/tasks/main.yml +++ b/roles/common/tasks/main.yml @@ -33,11 +33,18 @@ service: name={{item}} enabled=no state=stopped with_items: - firewalld # Because we want to use iptables-services below - - NetworkManager - atd.service - smartd.service ignore_errors: yes +- name: "Disable NetworkManager" + service: + name: NetworkManager + enabled: no + state: stopped + when: networkmanager is undefined + ignore_errors: yes + - name: Install ntp, iptables, ip6tables, rsyslog yum: name={{item}} state=present with_items: