From a28378396f2c34af336fd86bd4b081391d1b6ff6 Mon Sep 17 00:00:00 2001
From: Thomas Woerner <twoerner@redhat.com>
Date: Tue, 12 Feb 2019 13:45:57 +0100
Subject: [PATCH] ipa[server,replica]: Renamed X_no_firewalld to
X_setup_firewalld
The use of the _no_ prefix was not good and has been fixed now.
The X_setup_firewalld settings default to yes.
---
roles/ipareplica/defaults/main.yml | 3 ++-
roles/ipareplica/tasks/install.yml | 4 ++--
roles/ipaserver/defaults/main.yml | 2 +-
roles/ipaserver/tasks/install.yml | 4 ++--
4 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/roles/ipareplica/defaults/main.yml b/roles/ipareplica/defaults/main.yml
index a9dc4f91..d60c68c9 100644
--- a/roles/ipareplica/defaults/main.yml
+++ b/roles/ipareplica/defaults/main.yml
@@ -39,4 +39,5 @@ ipareplica_ignore_last_of_role: no
### additional ###
### packages ###
ipareplica_install_packages: yes
-ipareplica_no_firewalld: no
+### firewalld ###
+ipareplica_setup_firewalld: yes
diff --git a/roles/ipareplica/tasks/install.yml b/roles/ipareplica/tasks/install.yml
index 263fd8c6..53e58bb3 100644
--- a/roles/ipareplica/tasks/install.yml
+++ b/roles/ipareplica/tasks/install.yml
@@ -95,7 +95,7 @@
--add-service=freeipa-replication
{{ "--add-service=dns" if ipareplica_setup_dns | bool else "" }}
{{ "--add-service=ntp" if not ipaclient_no_ntp | bool else "" }}
- when: not ipareplica_no_firewalld | bool
+ when: ipareplica_setup_firewalld | bool
- name: Install - Configure firewalld runtime
command: >
@@ -105,7 +105,7 @@
--add-service=freeipa-replication
{{ "--add-service=dns" if ipareplica_setup_dns | bool else "" }}
{{ "--add-service=ntp" if not ipaclient_no_ntp | bool else "" }}
- when: not ipareplica_no_firewalld | bool
+ when: ipareplica_setup_firewalld | bool
- name: Install - Replica preparation
ipareplica_prepare:
diff --git a/roles/ipaserver/defaults/main.yml b/roles/ipaserver/defaults/main.yml
index edf3c5d3..57d611e0 100644
--- a/roles/ipaserver/defaults/main.yml
+++ b/roles/ipaserver/defaults/main.yml
@@ -33,7 +33,7 @@ ipaserver_setup_ca: yes
### packages ###
ipaserver_install_packages: yes
### firewalld ###
-ipaserver_no_firewalld: no
+ipaserver_setup_firewalld: yes
### additional ###
ipaserver_allow_missing: [ ]
diff --git a/roles/ipaserver/tasks/install.yml b/roles/ipaserver/tasks/install.yml
index 196a64d8..7808dd46 100644
--- a/roles/ipaserver/tasks/install.yml
+++ b/roles/ipaserver/tasks/install.yml
@@ -378,7 +378,7 @@
--add-service=freeipa-ldaps
{{ "--add-service=dns" if ipaserver_setup_dns | bool else "" }}
{{ "--add-service=ntp" if not ipaclient_no_ntp | bool else "" }}
- when: not ipaserver_no_firewalld | bool
+ when: ipaserver_setup_firewalld | bool
- name: Install - Configure firewalld runtime
command: >
@@ -387,4 +387,4 @@
--add-service=freeipa-ldaps
{{ "--add-service=dns" if ipaserver_setup_dns | bool else "" }}
{{ "--add-service=ntp" if not ipaclient_no_ntp | bool else "" }}
- when: not ipaserver_no_firewalld | bool
+ when: ipaserver_setup_firewalld | bool
--
GitLab