internet/ansible-freeipa
4
0
Fork 0
mirror of https://github.com/freeipa/ansible-freeipa.git synced 2026-06-23 17:24:52 +00:00
Code Issues Projects Releases Wiki Activity

ipa[server,replica]: Renamed X_no_firewalld to X_setup_firewalld

Browse Source 
The use of the _no_ prefix was not good and has been fixed now.

The X_setup_firewalld settings default to yes.
This commit is contained in:
Thomas Woerner
2019-02-12 13:45:57 +01:00
parent 77d0a1067a
commit a28378396f
4 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
roles/ipareplica/defaults/main.yml
View File

@@ -39,4 +39,5 @@ ipareplica_ignore_last_of_role: no
### additional ### ### additional ###
### packages ### ### packages ###
ipareplica_install_packages: yes ipareplica_install_packages: yes
ipareplica_no_firewalld: no ### firewalld ###
ipareplica_setup_firewalld: yes

4
roles/ipareplica/tasks/install.yml
View File

@@ -95,7 +95,7 @@
--add-service=freeipa-replication --add-service=freeipa-replication
{{ "--add-service=dns" if ipareplica_setup_dns | bool else "" }} {{ "--add-service=dns" if ipareplica_setup_dns | bool else "" }}
{{ "--add-service=ntp" if not ipaclient_no_ntp | 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 - name: Install - Configure firewalld runtime
command: > command: >
@@ -105,7 +105,7 @@
--add-service=freeipa-replication --add-service=freeipa-replication
{{ "--add-service=dns" if ipareplica_setup_dns | bool else "" }} {{ "--add-service=dns" if ipareplica_setup_dns | bool else "" }}
{{ "--add-service=ntp" if not ipaclient_no_ntp | 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 - name: Install - Replica preparation
ipareplica_prepare: ipareplica_prepare:

2
roles/ipaserver/defaults/main.yml
View File

@@ -33,7 +33,7 @@ ipaserver_setup_ca: yes
### packages ### ### packages ###
ipaserver_install_packages: yes ipaserver_install_packages: yes
### firewalld ### ### firewalld ###
ipaserver_no_firewalld: no ipaserver_setup_firewalld: yes
### additional ### ### additional ###
ipaserver_allow_missing: [ ] ipaserver_allow_missing: [ ]

4
roles/ipaserver/tasks/install.yml
View File

@@ -378,7 +378,7 @@
--add-service=freeipa-ldaps --add-service=freeipa-ldaps
{{ "--add-service=dns" if ipaserver_setup_dns | bool else "" }} {{ "--add-service=dns" if ipaserver_setup_dns | bool else "" }}
{{ "--add-service=ntp" if not ipaclient_no_ntp | 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 - name: Install - Configure firewalld runtime
command: > command: >
@@ -387,4 +387,4 @@
--add-service=freeipa-ldaps --add-service=freeipa-ldaps
{{ "--add-service=dns" if ipaserver_setup_dns | bool else "" }} {{ "--add-service=dns" if ipaserver_setup_dns | bool else "" }}
{{ "--add-service=ntp" if not ipaclient_no_ntp | bool else "" }} {{ "--add-service=ntp" if not ipaclient_no_ntp | bool else "" }}
when: not ipaserver_no_firewalld | bool when: ipaserver_setup_firewalld | bool