From e3bf82d873f223e874016db172488f239a67a7cf Mon Sep 17 00:00:00 2001
From: Thomas Woerner <twoerner@redhat.com>
Date: Mon, 9 Jan 2023 17:36:56 +0100
Subject: [PATCH] utils/galaxyfy.py: Support builtins with ansible.builtin.
prefix
The ansible builtins are using the ansible.builtin. prefix now, but
galaxyfy was not supporting the prefix. Therefore vars in set_fact tasks
got the collection prefix and include_role tasks have not been handled
correctly.
---
utils/galaxyfy.py | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/utils/galaxyfy.py b/utils/galaxyfy.py
index cdca17a8..bc5c16da 100644
--- a/utils/galaxyfy.py
+++ b/utils/galaxyfy.py
@@ -39,13 +39,14 @@ def galaxyfy_playbook(project_prefix, collection_prefix, lines):
if stripped.startswith("- name:") or \
stripped.startswith("- block:"):
changeable = True
- elif stripped in ["set_fact:", "vars:"]:
+ elif stripped in ["set_fact:", "ansible.builtin.set_fact:", "vars:"]:
changeable = False
include_role = False
elif stripped == "roles:":
changeable = True
include_role = False
- elif stripped.startswith("include_role:"):
+ elif (stripped.startswith("include_role:") or
+ stripped.startswith("ansible.builtin.include_role:")):
include_role = True
elif include_role and stripped.startswith("name:"):
line = po2.sub(pattern2, line)
--
GitLab