internet/ansible-freeipa
4
0
Fork 0
mirror of https://github.com/freeipa/ansible-freeipa.git synced 2026-07-25 00:44:42 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1324 from t-woerner/no_role_plugin_duplicates

Browse Source 
utils/build-galaxy-release.sh: Do not create duplicates for role plugins
This commit is contained in:
Rafael Guterres Jeffman
2024-12-11 10:29:07 -03:00
committed by GitHub
parent 227c95e62e a4f608854d
commit b7ed9ecfd5
2 changed files with 11 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
roles/ipaserver/module_utils/ansible_ipa_server.py
View File

@@ -23,7 +23,9 @@
from __future__ import (absolute_import, division, print_function) from __future__ import (absolute_import, division, print_function)
__metaclass__ = type # pylint: disable=invalid-name # pylint: disable=invalid-name
__metaclass__ = type
# pylint: enable=invalid-name
__all__ = ["IPAChangeConf", "certmonger", "sysrestore", "root_logger", __all__ = ["IPAChangeConf", "certmonger", "sysrestore", "root_logger",
"ipa_generate_password", "run", "ScriptError", "services", "ipa_generate_password", "run", "ScriptError", "services",

27
utils/build-galaxy-release.sh
View File

@@ -140,21 +140,18 @@ sed -i -e "s/ansible.module_utils.ansible_freeipa_module/ansible_collections.${c
python utils/create_action_group.py "meta/runtime.yml" "$collection_prefix" python utils/create_action_group.py "meta/runtime.yml" "$collection_prefix"
(cd plugins/module_utils && { mv roles/*/module_utils/*.py plugins/module_utils/
ln -sf ../../roles/*/module_utils/*.py . rmdir roles/*/module_utils
})
(cd plugins/modules && { sed -i -e "s/ansible.module_utils.ansible_ipa_/ansible_collections.${collection_prefix}.plugins.module_utils.ansible_ipa_/" roles/*/library/*.py
sed -i -e "s/ansible.module_utils.ansible_ipa_/ansible_collections.${collection_prefix}.plugins.module_utils.ansible_ipa_/" ../../roles/*/library/*.py mv roles/*/library/*.py plugins/modules/
ln -sf ../../roles/*/library/*.py . rmdir roles/*/library
})
# There are no action plugins anymore in the roles, therefore this section # There are no action plugins anymore in the roles, therefore this section
# is commneted out. # is commneted out.
#[ ! -x plugins/action ] && mkdir plugins/action #[ ! -x plugins/action ] && mkdir plugins/action
#(cd plugins/action && { #mv roles/*/action_plugins/*.py plugins/action/
# ln -sf ../../roles/*/action_plugins/*.py . #rmdir roles/*/action_plugins
#})
# Adapt inventory plugin and inventory plugin README # Adapt inventory plugin and inventory plugin README
echo "Fixing inventory plugin and doc..." echo "Fixing inventory plugin and doc..."
@@ -181,19 +178,11 @@ find plugins/modules -name "*.py" -print0 |
done done
echo -e "\033[AFixing examples in plugins/modules... \033[32;1mDONE\033[0m" echo -e "\033[AFixing examples in plugins/modules... \033[32;1mDONE\033[0m"
echo "Fixing examples in roles/*/library..."
find roles/*/library -name "*.py" -print0 |
while IFS= read -d '' -r line; do
python utils/galaxyfy-module-EXAMPLES.py "$line" \
"ipa" "$collection_prefix"
done
echo -e "\033[AFixing examples in roles/*/library... \033[32;1mDONE\033[0m"
echo "Fixing playbooks in roles/*/tasks..." echo "Fixing playbooks in roles/*/tasks..."
for line in roles/*/tasks/*.yml; do for line in roles/*/tasks/*.yml; do
python utils/galaxyfy-playbook.py "$line" "ipa" "$collection_prefix" python utils/galaxyfy-playbook.py "$line" "ipa" "$collection_prefix"
done done
echo -e "\033[AFixing playbooks in roles/*tasks... \033[32;1mDONE\033[0m" echo -e "\033[AFixing playbooks in roles/*/tasks... \033[32;1mDONE\033[0m"
echo "Fixing playbooks in playbooks..." echo "Fixing playbooks in playbooks..."
find playbooks -name "*.yml" -print0 | find playbooks -name "*.yml" -print0 |