Skip to content

Commit

Permalink
[pfsense_openvpn_override] support changed semantics of push_reset
Browse files Browse the repository at this point in the history
…in pfSense Plus 24.11
  • Loading branch information
opoplawski committed Jan 27, 2025
1 parent 0b0e976 commit 3a08e91
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 1 deletion.
2 changes: 2 additions & 0 deletions changelogs/fragments/openvpn_override.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
minor_changes:
- pfsense_openvpn_override - support changed semantics of ``push_reset`` in pfSense Plus 24.11
12 changes: 11 additions & 1 deletion plugins/module_utils/openvpn_override.py
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,10 @@ def _params_to_obj(self):
self._get_ansible_param_bool(obj, 'disable')
self._get_ansible_param_bool(obj, 'block', force=True, value='yes')
self._get_ansible_param_bool(obj, 'gwredir', force=True, value='yes')
self._get_ansible_param_bool(obj, 'push_reset', force=True, value='yes')
if self.pfsense.config_version >= 23.4:
self._get_ansible_param_bool(obj, 'push_reset')
else:
self._get_ansible_param_bool(obj, 'push_reset', force=True, value='yes')
obj['tunnel_network'] = self.params['tunnel_network']
obj['tunnel_networkv6'] = self.params['tunnel_networkv6']
obj['local_network'] = self.params['local_network']
Expand Down Expand Up @@ -188,6 +191,13 @@ def _find_target(self):
(target_elt, self.idx) = self._find_openvpn_csc(self.obj['common_name'])
return target_elt

def _get_params_to_remove(self):
""" returns the list of params to remove if they are not set """
params_to_remove = []
if self.pfsense.config_version >= 23.4:
params_to_remove.append('push_reset')
return params_to_remove

def _remove_target_elt(self):
""" delete target_elt from xml """
super(PFSenseOpenVPNOverrideModule, self)._remove_target_elt()
Expand Down

0 comments on commit 3a08e91

Please sign in to comment.