Properly handle FieldAttribute.default if callable (#48992)

* Properly handle FieldAttribute.default if callable

Fixes #48673

* Add changelog...

* Add integration test

* Add aliases file

(cherry picked from commit 48ffd8789f)

changelogs/fragments/48673-fix-omit-on-play-keywords.yaml

@@ -0,0 +1,2 @@
+bugfixes:
+  - Fix using omit on play keywords (https://github.com/ansible/ansible/issues/48673)

lib/ansible/playbook/base.py

@@ -366,6 +366,9 @@ class FieldAttributeBase(with_metaclass(BaseMeta, object)):
                 # if this evaluated to the omit value, set the value back to
                 # the default specified in the FieldAttribute and move on
                 if omit_value is not None and value == omit_value:
+                    if callable(attribute.default):
+                        setattr(self, name, attribute.default())
+                    else:
                         setattr(self, name, attribute.default)
                     continue
 
@@ -548,6 +551,9 @@ class FieldAttributeBase(with_metaclass(BaseMeta, object)):
         for (name, attribute) in iteritems(self._valid_attrs):
             if name in data:
                 setattr(self, name, data[name])
+            else:
+                if callable(attribute.default):
+                    setattr(self, name, attribute.default())
                 else:
                     setattr(self, name, attribute.default)
 

test/integration/targets/omit/48673.yml

@@ -0,0 +1,4 @@
+- hosts: localhost
+  serial: "{{ testing_omitted_variable | default(omit) }}"
+  tasks:
+    - debug:

test/integration/targets/omit/aliases

@@ -0,0 +1 @@
+shippable/posix/group3

test/integration/targets/omit/runme.sh

@@ -0,0 +1,5 @@
+#!/usr/bin/env bash
+
+set -eux
+
+ansible-playbook 48673.yml -i ../../inventory -v "$@"