internet/ansible-freeipa
4
0
Fork 0
mirror of https://github.com/freeipa/ansible-freeipa.git synced 2026-07-30 11:24:50 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #658 from t-woerner/fix_galaxyfy_roles_after_vars

Browse Source 
galaxyfy: Fix roles after vars
This commit is contained in:
Thomas Woerner
2021-10-12 15:27:51 +02:00
committed by GitHub
parent be78368eb0 c92e9a5ca1
commit d1c3ecc95d
1 changed files with 16 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
utils/galaxyfy.py
View File

@@ -24,8 +24,8 @@ import re
def galaxyfy_playbook(project_prefix, collection_prefix, lines): def galaxyfy_playbook(project_prefix, collection_prefix, lines):
p1 = re.compile('(%s.*:)$' % project_prefix) po1 = re.compile('(%s.*:)$' % project_prefix)
p2 = re.compile('(.*:) (%s.*)$' % project_prefix) po2 = re.compile('(.*:) (%s.*)$' % project_prefix)
out_lines = [] out_lines = []
pattern1 = r'%s.\1' % collection_prefix pattern1 = r'%s.\1' % collection_prefix
@@ -35,30 +35,34 @@ def galaxyfy_playbook(project_prefix, collection_prefix, lines):
changeable = False changeable = False
include_role = False include_role = False
for line in lines: for line in lines:
stripped = line.strip() line = line.rstrip()
stripped = line.lstrip()
if stripped.startswith("- name:") or \ if stripped.startswith("- name:") or \
stripped.startswith("- block:"): stripped.startswith("- block:"):
changeable = True changeable = True
elif stripped in ["set_fact:", "vars:"]: elif stripped in ["set_fact:", "vars:"]:
changeable = False changeable = False
include_role = False include_role = False
elif stripped == "roles:":
changeable = True
include_role = False
elif stripped.startswith("include_role:"): elif stripped.startswith("include_role:"):
include_role = True include_role = True
elif include_role and stripped.startswith("name:"): elif include_role and stripped.startswith("name:"):
line = p2.sub(pattern2, line) line = po2.sub(pattern2, line)
changed = True changed = True
elif changeable and stripped.startswith("- role:"): elif changeable and stripped.startswith("- role:"):
line = p2.sub(pattern2, line) line = po2.sub(pattern2, line)
changed = True changed = True
elif (changeable and stripped.startswith(project_prefix) and elif (changeable and stripped.startswith(project_prefix)
not stripped.startswith(collection_prefix) and and not stripped.startswith(collection_prefix) # noqa
stripped.endswith(":")): and stripped.endswith(":")): # noqa
line = p1.sub(pattern1, line) line = po1.sub(pattern1, line)
changed = True changed = True
changeable = False # Only change first line in task changeable = False # Only change first line in task
elif (stripped.startswith("- %s" % project_prefix) and elif (stripped.startswith("- %s" % project_prefix)
stripped.endswith(":")): and stripped.endswith(":")): # noqa
line = p1.sub(pattern1, line) line = po1.sub(pattern1, line)
changed = True changed = True
out_lines.append(line) out_lines.append(line)