Merge pull request #413 from PaloAltoNetworks/develop

Release 2.2.3
PaloAltoNetworks · Jul 9, 2019 · 6da2d7b · 6da2d7b
2 parents ad1ca6f + 9201ac2
commit 6da2d7b
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 3 deletions.
diff --git a/docs/history.md b/docs/history.md
@@ -1,6 +1,16 @@
 Release History
 ===============
 
+V2.2.3
+------
+
+- *Released*: 2019-07-09
+
+Bug fixes:
+
+* Fixed `create_default_route` handling with both `panos_interface`
+  and `panos_l3_subinterface`
+
 V2.2.2
 ------
 

diff --git a/library/panos_interface.py b/library/panos_interface.py
@@ -286,10 +286,17 @@ def main():
         'ipv4_mss_adjust': module.params['ipv4_mss_adjust'],
         'ipv6_mss_adjust': module.params['ipv6_mss_adjust'],
         'enable_dhcp': True if module.params['enable_dhcp'] else None,
-        'create_dhcp_default_route': True if module.params['create_default_route'] else None,
+        # 'create_dhcp_default_route': set below
         'dhcp_default_route_metric': module.params['dhcp_default_route_metric'],
     }
 
+    if module.params['create_default_route']:
+        spec['create_dhcp_default_route'] = True
+    elif spec['enable_dhcp']:
+        spec['create_dhcp_default_route'] = False
+    else:
+        spec['create_dhcp_default_route'] = None
+
     # Get other info.
     state = module.params['state']
     zone_name = module.params['zone_name']

diff --git a/library/panos_l3_subinterface.py b/library/panos_l3_subinterface.py
@@ -192,10 +192,17 @@ def main():
         'ipv4_mss_adjust': module.params['ipv4_mss_adjust'],
         'ipv6_mss_adjust': module.params['ipv6_mss_adjust'],
         'enable_dhcp': True if module.params['enable_dhcp'] else None,
-        'create_dhcp_default_route': True if module.params['create_default_route'] else None,
+        # 'create_dhcp_default_route': set below
         'dhcp_default_route_metric': module.params['dhcp_default_route_metric'],
     }
 
+    if module.params['create_default_route']:
+        spec['create_dhcp_default_route'] = True
+    elif spec['enable_dhcp']:
+        spec['create_dhcp_default_route'] = False
+    else:
+        spec['create_dhcp_default_route'] = None
+
     # Get other info.
     state = module.params['state']
     zone_name = module.params['zone_name']

diff --git a/setup.py b/setup.py
@@ -10,7 +10,7 @@
 
 setup(
     name='ansible-pan',
-    version='2.2.2',
+    version='2.2.3',
     packages=['library'],
     # The project's main homepage.
     url='https://github.com/PaloAltoNetworks/ansible-pan',