Skip to content

Commit db81ac6

Browse files
vitabaksvitabaks
committed
firewall: prevent errors when there are host groups undefined in firewall_allowed_tcp_ports_for and firewall_additional_rules_for variables
1 parent 0d9287f commit db81ac6

7 files changed

+14
-14
lines changed

‎add_balancer.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@
8585

8686
- name: Build a firewall_ports_dynamic_var
8787
set_fact:
88-
firewall_ports_dynamic_var: "{{ firewall_ports_dynamic_var | default([]) + (firewall_allowed_tcp_ports_for[item]) }}"
88+
firewall_ports_dynamic_var: "{{ firewall_ports_dynamic_var | default([]) + (firewall_allowed_tcp_ports_for[item] | default([])) }}"
8989
loop: "{{ hostvars[inventory_hostname].group_names }}"
9090
when:
9191
- new_node | default(false) | bool
@@ -94,7 +94,7 @@
9494

9595
- name: Build a firewall_rules_dynamic_var
9696
set_fact:
97-
firewall_rules_dynamic_var: "{{ firewall_rules_dynamic_var | default([]) + (firewall_additional_rules_for[item]) }}"
97+
firewall_rules_dynamic_var: "{{ firewall_rules_dynamic_var | default([]) + (firewall_additional_rules_for[item] | default([])) }}"
9898
loop: "{{ hostvars[inventory_hostname].group_names }}"
9999
when:
100100
- new_node | default(false) | bool

‎add_pgnode.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@
9393

9494
- name: Build a firewall_ports_dynamic_var
9595
set_fact:
96-
firewall_ports_dynamic_var: "{{ firewall_ports_dynamic_var | default([]) + (firewall_allowed_tcp_ports_for[item]) }}"
96+
firewall_ports_dynamic_var: "{{ firewall_ports_dynamic_var | default([]) + (firewall_allowed_tcp_ports_for[item] | default([])) }}"
9797
loop: "{{ hostvars[inventory_hostname].group_names }}"
9898
when:
9999
- new_node | default(false) | bool
@@ -102,7 +102,7 @@
102102

103103
- name: Build a firewall_rules_dynamic_var
104104
set_fact:
105-
firewall_rules_dynamic_var: "{{ firewall_rules_dynamic_var | default([]) + (firewall_additional_rules_for[item]) }}"
105+
firewall_rules_dynamic_var: "{{ firewall_rules_dynamic_var | default([]) + (firewall_additional_rules_for[item] | default([])) }}"
106106
loop: "{{ hostvars[inventory_hostname].group_names }}"
107107
when:
108108
- new_node | default(false) | bool

‎balancers.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -60,14 +60,14 @@
6060

6161
- name: Build a firewall_ports_dynamic_var
6262
set_fact:
63-
firewall_ports_dynamic_var: "{{ firewall_ports_dynamic_var | default([]) + (firewall_allowed_tcp_ports_for[item]) }}"
63+
firewall_ports_dynamic_var: "{{ firewall_ports_dynamic_var | default([]) + (firewall_allowed_tcp_ports_for[item] | default([])) }}"
6464
loop: "{{ hostvars[inventory_hostname].group_names }}"
6565
when: firewall_enabled_at_boot|bool
6666
tags: firewall
6767

6868
- name: Build a firewall_rules_dynamic_var
6969
set_fact:
70-
firewall_rules_dynamic_var: "{{ firewall_rules_dynamic_var | default([]) + (firewall_additional_rules_for[item]) }}"
70+
firewall_rules_dynamic_var: "{{ firewall_rules_dynamic_var | default([]) + (firewall_additional_rules_for[item] | default([])) }}"
7171
loop: "{{ hostvars[inventory_hostname].group_names }}"
7272
when: firewall_enabled_at_boot|bool
7373
tags: firewall

‎config_pgcluster.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -86,14 +86,14 @@
8686

8787
- name: Build a firewall_ports_dynamic_var
8888
set_fact:
89-
firewall_ports_dynamic_var: "{{ firewall_ports_dynamic_var | default([]) + (firewall_allowed_tcp_ports_for[item]) }}"
89+
firewall_ports_dynamic_var: "{{ firewall_ports_dynamic_var | default([]) + (firewall_allowed_tcp_ports_for[item] | default([])) }}"
9090
loop: "{{ hostvars[inventory_hostname].group_names }}"
9191
when: firewall_enabled_at_boot|bool
9292
tags: config_firewall, firewall
9393

9494
- name: Build a firewall_rules_dynamic_var
9595
set_fact:
96-
firewall_rules_dynamic_var: "{{ firewall_rules_dynamic_var | default([]) + (firewall_additional_rules_for[item]) }}"
96+
firewall_rules_dynamic_var: "{{ firewall_rules_dynamic_var | default([]) + (firewall_additional_rules_for[item] | default([])) }}"
9797
loop: "{{ hostvars[inventory_hostname].group_names }}"
9898
when: firewall_enabled_at_boot|bool
9999
tags: firewall

‎consul.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -75,14 +75,14 @@
7575

7676
- name: Build a firewall_ports_dynamic_var
7777
set_fact:
78-
firewall_ports_dynamic_var: "{{ firewall_ports_dynamic_var | default([]) + (firewall_allowed_tcp_ports_for[item]) }}"
78+
firewall_ports_dynamic_var: "{{ firewall_ports_dynamic_var | default([]) + (firewall_allowed_tcp_ports_for[item] | default([])) }}"
7979
loop: "{{ hostvars[inventory_hostname].group_names }}"
8080
when: firewall_enabled_at_boot|bool
8181
tags: firewall
8282

8383
- name: Build a firewall_rules_dynamic_var
8484
set_fact:
85-
firewall_rules_dynamic_var: "{{ firewall_rules_dynamic_var | default([]) + (firewall_additional_rules_for[item]) }}"
85+
firewall_rules_dynamic_var: "{{ firewall_rules_dynamic_var | default([]) + (firewall_additional_rules_for[item] | default([])) }}"
8686
loop: "{{ hostvars[inventory_hostname].group_names }}"
8787
when: firewall_enabled_at_boot|bool
8888
tags: firewall

‎deploy_pgcluster.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -144,14 +144,14 @@
144144

145145
- name: Build a firewall_ports_dynamic_var
146146
set_fact:
147-
firewall_ports_dynamic_var: "{{ firewall_ports_dynamic_var | default([]) + (firewall_allowed_tcp_ports_for[item]) }}"
147+
firewall_ports_dynamic_var: "{{ firewall_ports_dynamic_var | default([]) + (firewall_allowed_tcp_ports_for[item] | default([])) }}"
148148
loop: "{{ hostvars[inventory_hostname].group_names }}"
149149
when: firewall_enabled_at_boot|bool
150150
tags: firewall
151151

152152
- name: Build a firewall_rules_dynamic_var
153153
set_fact:
154-
firewall_rules_dynamic_var: "{{ firewall_rules_dynamic_var | default([]) + (firewall_additional_rules_for[item]) }}"
154+
firewall_rules_dynamic_var: "{{ firewall_rules_dynamic_var | default([]) + (firewall_additional_rules_for[item] | default([])) }}"
155155
loop: "{{ hostvars[inventory_hostname].group_names }}"
156156
when: firewall_enabled_at_boot|bool
157157
tags: firewall

‎etcd_cluster.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -48,14 +48,14 @@
4848

4949
- name: Build a firewall_ports_dynamic_var
5050
set_fact:
51-
firewall_ports_dynamic_var: "{{ firewall_ports_dynamic_var | default([]) + (firewall_allowed_tcp_ports_for[item]) }}"
51+
firewall_ports_dynamic_var: "{{ firewall_ports_dynamic_var | default([]) + (firewall_allowed_tcp_ports_for[item] | default([])) }}"
5252
loop: "{{ hostvars[inventory_hostname].group_names }}"
5353
when: firewall_enabled_at_boot|bool
5454
tags: firewall
5555

5656
- name: Build a firewall_rules_dynamic_var
5757
set_fact:
58-
firewall_rules_dynamic_var: "{{ firewall_rules_dynamic_var | default([]) + (firewall_additional_rules_for[item]) }}"
58+
firewall_rules_dynamic_var: "{{ firewall_rules_dynamic_var | default([]) + (firewall_additional_rules_for[item] | default([])) }}"
5959
loop: "{{ hostvars[inventory_hostname].group_names }}"
6060
when: firewall_enabled_at_boot|bool
6161
tags: firewall

0 commit comments

Comments
 (0)