MSVSphere Packaging Team
3 months ago
parent
2540892221
commit
085e380b0b
GPG Key ID:
B2B0B9F29E528FE8
@ -1,31 +1,36 @@
|
|||||||
SOURCES/ad_integration-1.1.3.tar.gz
|
SOURCES/ad_integration-1.4.6.tar.gz
|
||||||
SOURCES/ansible-posix-1.5.4.tar.gz
|
SOURCES/ansible-posix-1.5.4.tar.gz
|
||||||
SOURCES/ansible-sshd-v0.19.0.tar.gz
|
SOURCES/ansible-sshd-v0.25.0.tar.gz
|
||||||
SOURCES/auto-maintenance-e010c878833e363195dd707d1334ff48a254b092.tar.gz
|
SOURCES/auto-maintenance-1.88.9.tar.gz
|
||||||
SOURCES/certificate-1.2.1.tar.gz
|
SOURCES/bootloader-1.0.7.tar.gz
|
||||||
SOURCES/cockpit-1.4.7.tar.gz
|
SOURCES/certificate-1.3.6.tar.gz
|
||||||
SOURCES/community-general-7.3.0.tar.gz
|
SOURCES/cockpit-1.5.10.tar.gz
|
||||||
SOURCES/containers-podman-1.10.3.tar.gz
|
SOURCES/community-general-9.3.0.tar.gz
|
||||||
SOURCES/crypto_policies-1.2.11.tar.gz
|
SOURCES/containers-podman-1.15.4.tar.gz
|
||||||
SOURCES/firewall-1.6.3.tar.gz
|
SOURCES/crypto_policies-1.4.0.tar.gz
|
||||||
SOURCES/ha_cluster-1.10.0.tar.gz
|
SOURCES/fapolicyd-1.1.7.tar.gz
|
||||||
SOURCES/journald-1.0.5.tar.gz
|
SOURCES/firewall-1.8.0.tar.gz
|
||||||
SOURCES/kdump-1.3.6.tar.gz
|
SOURCES/gfs2-1.0.0.tar.gz
|
||||||
SOURCES/kernel_settings-1.1.17.tar.gz
|
SOURCES/ha_cluster-1.19.2.tar.gz
|
||||||
SOURCES/keylime_server-1.0.0.tar.gz
|
SOURCES/journald-1.3.3.tar.gz
|
||||||
SOURCES/logging-1.11.9.tar.gz
|
SOURCES/kdump-1.4.7.tar.gz
|
||||||
SOURCES/metrics-1.8.6.tar.gz
|
SOURCES/kernel_settings-1.3.2.tar.gz
|
||||||
SOURCES/nbde_client-1.2.14.tar.gz
|
SOURCES/keylime_server-1.1.5.tar.gz
|
||||||
SOURCES/nbde_server-1.3.8.tar.gz
|
SOURCES/logging-1.13.4.tar.gz
|
||||||
SOURCES/network-1.13.1.tar.gz
|
SOURCES/metrics-1.10.6.tar.gz
|
||||||
SOURCES/podman-1.3.2.tar.gz
|
SOURCES/nbde_client-1.3.0.tar.gz
|
||||||
SOURCES/postfix-1.3.8.tar.gz
|
SOURCES/nbde_server-1.4.7.tar.gz
|
||||||
SOURCES/postgresql-1.1.0.tar.gz
|
SOURCES/network-1.16.4.tar.gz
|
||||||
SOURCES/rhc-1.2.4.tar.gz
|
SOURCES/podman-1.6.4.tar.gz
|
||||||
SOURCES/selinux-1.6.1.tar.gz
|
SOURCES/postfix-1.5.1.tar.gz
|
||||||
SOURCES/ssh-1.2.1.tar.gz
|
SOURCES/postgresql-1.3.8.tar.gz
|
||||||
SOURCES/storage-1.12.3.tar.gz
|
SOURCES/rhc-1.6.6.tar.gz
|
||||||
SOURCES/systemd-1.0.1.tar.gz
|
SOURCES/selinux-1.8.0.tar.gz
|
||||||
SOURCES/timesync-1.7.6.tar.gz
|
SOURCES/snapshot-1.4.1.tar.gz
|
||||||
SOURCES/tlog-1.2.16.tar.gz
|
SOURCES/ssh-1.5.0.tar.gz
|
||||||
SOURCES/vpn-1.5.8.tar.gz
|
SOURCES/storage-1.18.7.tar.gz
|
||||||
|
SOURCES/sudo-1.1.0.tar.gz
|
||||||
|
SOURCES/systemd-1.2.0.tar.gz
|
||||||
|
SOURCES/timesync-1.9.0.tar.gz
|
||||||
|
SOURCES/tlog-1.3.6.tar.gz
|
||||||
|
SOURCES/vpn-1.6.6.tar.gz
|
||||||
|
|||||||
@ -1,31 +1,36 @@
|
|||||||
4ed72d2549af3a2bf5232944dcd84c4203ec1f49 SOURCES/ad_integration-1.1.3.tar.gz
|
11b58e43e1b78cb75eda26724359f4d748173d5f SOURCES/ad_integration-1.4.6.tar.gz
|
||||||
da646eb9ba655f1693cc950ecb5c24af39ee1af6 SOURCES/ansible-posix-1.5.4.tar.gz
|
da646eb9ba655f1693cc950ecb5c24af39ee1af6 SOURCES/ansible-posix-1.5.4.tar.gz
|
||||||
edcfa5243b2e74c50ab8fd17f514bbc9df693c06 SOURCES/ansible-sshd-v0.19.0.tar.gz
|
5829f61d848d1fe52ecd1702c055eeed8ef56e70 SOURCES/ansible-sshd-v0.25.0.tar.gz
|
||||||
7b34305ca31a8df71f3ecec3410c7c4d262201bd SOURCES/auto-maintenance-e010c878833e363195dd707d1334ff48a254b092.tar.gz
|
56fbd9160cf34bbc1f251bfbe3dee5dcbf12cecc SOURCES/auto-maintenance-1.88.9.tar.gz
|
||||||
4483962040f0c29fa9c80950dc403ce7e9f17ed7 SOURCES/certificate-1.2.1.tar.gz
|
7ae4b79529d14c0c8958cf9633f8d560d718f4e7 SOURCES/bootloader-1.0.7.tar.gz
|
||||||
4ed2794a781e7976ff2a0b4c6abbf008859ef982 SOURCES/cockpit-1.4.7.tar.gz
|
45ba484be2962e9fd70dbf09bb5e34a900e000cb SOURCES/certificate-1.3.6.tar.gz
|
||||||
ee7868c57b3d1ce170b61a1d42c840ba1428aeac SOURCES/community-general-7.3.0.tar.gz
|
15677bec6ddafb75911d7c29fe1eb1c24b9b4f1c SOURCES/cockpit-1.5.10.tar.gz
|
||||||
711423c6503c1e137d7c38b6a0718e5768f40d21 SOURCES/containers-podman-1.10.3.tar.gz
|
06964c4eefee9b942425e479324b781d88885e82 SOURCES/community-general-9.3.0.tar.gz
|
||||||
aee5eb307f5a40a8a222a0dd7713b230bc3324a7 SOURCES/crypto_policies-1.2.11.tar.gz
|
2c0a98aedb2c031bfc94609bc9553d192224b159 SOURCES/containers-podman-1.15.4.tar.gz
|
||||||
81ac41f0c7d06dbb92d70b8d9a0a0b0a6474411c SOURCES/firewall-1.6.3.tar.gz
|
fbf7f7a452d72dc0f884947da98795082042782e SOURCES/crypto_policies-1.4.0.tar.gz
|
||||||
aa11011e00fe8a86999688149d60f5d0a4ed5cbf SOURCES/ha_cluster-1.10.0.tar.gz
|
5c0ecbe8246a0d8dde0930ef111f1c17a4976797 SOURCES/fapolicyd-1.1.7.tar.gz
|
||||||
88e721b5d804f00e7b044310d47b2dd40ac83f8f SOURCES/journald-1.0.5.tar.gz
|
f4eb8ea59532a630408593594ded54cbd2eaf04f SOURCES/firewall-1.8.0.tar.gz
|
||||||
64680ec0f3ea03fc5c0a5792ceeaa193d6154fdd SOURCES/kdump-1.3.6.tar.gz
|
cc1a45ba4a6a0b34186197599f02cbb437c5abbd SOURCES/gfs2-1.0.0.tar.gz
|
||||||
43338d3ffdc79961564504822a84462cefa8ff5a SOURCES/kernel_settings-1.1.17.tar.gz
|
8ecc501560bc115deeb72797dfb8a63b583a3a48 SOURCES/ha_cluster-1.19.2.tar.gz
|
||||||
81b0e4e1f71f01a008181494eefc542506cd3823 SOURCES/keylime_server-1.0.0.tar.gz
|
0541cf78ef043606ecb97fadc97046645c9f0857 SOURCES/journald-1.3.3.tar.gz
|
||||||
0963ecef1330048c25bb9a778b5ac15c24e77df2 SOURCES/logging-1.11.9.tar.gz
|
4a61f3e6e5ed0ed6bcbb4ac400ecdce1ae3cd679 SOURCES/kdump-1.4.7.tar.gz
|
||||||
af61299d39b4a7d5e37507a898ddba55e3f053d6 SOURCES/metrics-1.8.6.tar.gz
|
75c64569c8b89435f8d0907e9c057ea142d86a4e SOURCES/kernel_settings-1.3.2.tar.gz
|
||||||
b8c7ff7dadbd84aeb13e94c4be3be0f8ee9549cd SOURCES/nbde_client-1.2.14.tar.gz
|
7dc7288b26c73e19ed0b0a723cafd43e8bdf2be8 SOURCES/keylime_server-1.1.5.tar.gz
|
||||||
a5d2a5afd45447edb17f6a9615eabb80501e61f3 SOURCES/nbde_server-1.3.8.tar.gz
|
4825923fc0fa29e80c08864b0afc50e2e075be91 SOURCES/logging-1.13.4.tar.gz
|
||||||
fe9426eaf3e7a5a31ebe5707e4a17770bca7a6b6 SOURCES/network-1.13.1.tar.gz
|
b0b4b0af1872dc7bdd3c36e4ff40547a31cc4ed0 SOURCES/metrics-1.10.6.tar.gz
|
||||||
8b49515b4c5d8b1f5e06be6c7fdeff7ab622c495 SOURCES/podman-1.3.2.tar.gz
|
544c5c9e53beef034b0d39ecf944e0bb13231535 SOURCES/nbde_client-1.3.0.tar.gz
|
||||||
b91070ba6fa7b4a9072aa2d1a2ef4b169aab0f00 SOURCES/postfix-1.3.8.tar.gz
|
caa3786c527a633d42278cb0b1d0c4ae37506237 SOURCES/nbde_server-1.4.7.tar.gz
|
||||||
504cde6540ff1b5527b2ddf9aa90a95e29d7ffc3 SOURCES/postgresql-1.1.0.tar.gz
|
d41648a85e772f0a69ec1726595e2c33fac1d2e2 SOURCES/network-1.16.4.tar.gz
|
||||||
a6097168bd1b54a46be8b5f4adfdab9b5ec8ddb5 SOURCES/rhc-1.2.4.tar.gz
|
9c34efd3ec797a50e8eb47f8a559e537fde33f40 SOURCES/podman-1.6.4.tar.gz
|
||||||
bb2a5e711233e527d0a11914bd566f47a2cfe9e6 SOURCES/selinux-1.6.1.tar.gz
|
29bc04e0b7e231251360f86d9cbcaa6841d8a3ba SOURCES/postfix-1.5.1.tar.gz
|
||||||
c03dbda563ec7d3c2ae2c7bfd6aab88c6c19fbac SOURCES/ssh-1.2.1.tar.gz
|
9bd35cfa10bc5a3eb9f467e6114ae6dcebb55a01 SOURCES/postgresql-1.3.8.tar.gz
|
||||||
84085e0f750181aee340e02258fd5888d563698e SOURCES/storage-1.12.3.tar.gz
|
b6932d2f66bfba15257d3f6d23f02e028eaa0638 SOURCES/rhc-1.6.6.tar.gz
|
||||||
1c7ac80df7288f7d3469e376316305eadd2dc2dc SOURCES/systemd-1.0.1.tar.gz
|
9498596941d29a96c84e122e047f87e95788be7e SOURCES/selinux-1.8.0.tar.gz
|
||||||
e4fe253906ffd7ce2ecca71a63a0e96e5f562e0c SOURCES/timesync-1.7.6.tar.gz
|
4dc75265463cbf83c9779c65bd177ed204300aee SOURCES/snapshot-1.4.1.tar.gz
|
||||||
544d0591a0ae73b73c1ab5bc280cdc8d5598f322 SOURCES/tlog-1.2.16.tar.gz
|
b6acf6754f53c7dfda709060a1730ab7ff6d2009 SOURCES/ssh-1.5.0.tar.gz
|
||||||
1d959b0b5f6bd261d392b0740fd86915c7b35c17 SOURCES/vpn-1.5.8.tar.gz
|
0266534ede746114046b1158c61bccf8bc60d8e4 SOURCES/storage-1.18.7.tar.gz
|
||||||
|
4e03fa316429b024931e09962827f89b2e345462 SOURCES/sudo-1.1.0.tar.gz
|
||||||
|
b1e978dfed627fcdf885899416d239ee8a061fc8 SOURCES/systemd-1.2.0.tar.gz
|
||||||
|
0a9df710ddd8a43e74cbd77e4414d5ea7e90d7b9 SOURCES/timesync-1.9.0.tar.gz
|
||||||
|
789253ee36294f77dd8be3de42c973956dd86fbb SOURCES/tlog-1.3.6.tar.gz
|
||||||
|
82e444fc7ed54b874f7b0b3c40e22b307b6c0924 SOURCES/vpn-1.6.6.tar.gz
|
||||||
|
|||||||
@ -1,127 +0,0 @@
|
|||||||
From 1931ebccaa146bd6ee8365c664ab62d294adaa31 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Rich Megginson <rmeggins@redhat.com>
|
|
||||||
Date: Fri, 18 Aug 2023 12:35:44 -0600
|
|
||||||
Subject: [PATCH] fix: use command stdin for password, and do not log password
|
|
||||||
|
|
||||||
Cause: The code was constructing the realm join command to be passed
|
|
||||||
via the shell module, including piping the password into the command,
|
|
||||||
and was showing the command, including the password, when using
|
|
||||||
check mode.
|
|
||||||
|
|
||||||
Consequence: The clear text password was available in the logs when
|
|
||||||
using check mode.
|
|
||||||
|
|
||||||
Fix: Use command with stdin for the password instead of shell. The
|
|
||||||
password is not part of the command. command with stdin is more
|
|
||||||
secure than using shell. The debug output has been changed to
|
|
||||||
show the command with the `ad_integration_join_parameters` removed,
|
|
||||||
because we cannot know if those parameters contain data which should
|
|
||||||
not be logged. Those parameters will still be passed to the actual
|
|
||||||
realm join command.
|
|
||||||
|
|
||||||
Result: The password is not logged. The role is more secure.
|
|
||||||
|
|
||||||
Signed-off-by: Rich Megginson <rmeggins@redhat.com>
|
|
||||||
---
|
|
||||||
tasks/main.yml | 57 ++++++++++++++++++++++++++++----------------------
|
|
||||||
1 file changed, 32 insertions(+), 25 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/tasks/main.yml b/tasks/main.yml
|
|
||||||
index fe2602e..265c6fe 100644
|
|
||||||
--- a/tasks/main.yml
|
|
||||||
+++ b/tasks/main.yml
|
|
||||||
@@ -3,8 +3,7 @@
|
|
||||||
- name: Ensure that mandatory variable ad_integration_realm is available
|
|
||||||
fail:
|
|
||||||
msg: Variable ad_integration_realm must be provided!
|
|
||||||
- when:
|
|
||||||
- - not ad_integration_realm
|
|
||||||
+ when: not ad_integration_realm
|
|
||||||
|
|
||||||
- name: Assume managing timesync if timesource is set
|
|
||||||
set_fact:
|
|
||||||
@@ -26,8 +25,7 @@
|
|
||||||
- name: Assume managing crypto policies if allow_rc4_crypto is set
|
|
||||||
set_fact:
|
|
||||||
ad_integration_manage_crypto_policies: true
|
|
||||||
- when:
|
|
||||||
- - ad_integration_allow_rc4_crypto | bool
|
|
||||||
+ when: ad_integration_allow_rc4_crypto | bool
|
|
||||||
|
|
||||||
- name: Ensure manage_crypt_policies is set with crypto_allow_rc4
|
|
||||||
fail:
|
|
||||||
@@ -141,41 +139,50 @@
|
|
||||||
|
|
||||||
- name: Build Command - Join to a specific Domain Controller
|
|
||||||
set_fact:
|
|
||||||
- __ad_integration_join_command: |
|
|
||||||
- set -euo pipefail
|
|
||||||
- echo {{ ad_integration_password | quote }} | realm join -U \
|
|
||||||
- {{ ad_integration_user | quote }} --membership-software \
|
|
||||||
- {{ ad_integration_membership_software | quote }} \
|
|
||||||
- {{ ad_integration_join_parameters }} \
|
|
||||||
- {{ ad_integration_join_to_dc | quote }}
|
|
||||||
+ __ad_integration_join_command: >-
|
|
||||||
+ realm join -U {{ ad_integration_user | quote }} --membership-software
|
|
||||||
+ {{ ad_integration_membership_software | quote }}
|
|
||||||
+ {{ ad_integration_join_parameters }}
|
|
||||||
+ {{ ad_integration_join_to_dc | quote }}
|
|
||||||
+ __ad_integration_debug_command: >-
|
|
||||||
+ realm join -U {{ ad_integration_user | quote }} --membership-software
|
|
||||||
+ {{ ad_integration_membership_software | quote }}
|
|
||||||
+ {{ ad_integration_join_to_dc | quote }}
|
|
||||||
no_log: true
|
|
||||||
- when:
|
|
||||||
- - ad_integration_join_to_dc is not none
|
|
||||||
+ when: ad_integration_join_to_dc is not none
|
|
||||||
|
|
||||||
- name: Build Join Command - Perform discovery-based realm join operation
|
|
||||||
set_fact:
|
|
||||||
- __ad_integration_join_command: |
|
|
||||||
- set -euo pipefail
|
|
||||||
- echo {{ ad_integration_password | quote }} | realm join -U \
|
|
||||||
- {{ ad_integration_user | quote }} --membership-software \
|
|
||||||
- {{ ad_integration_membership_software | quote }} \
|
|
||||||
- {{ ad_integration_join_parameters }} \
|
|
||||||
- {{ ad_integration_realm | quote }}
|
|
||||||
+ __ad_integration_join_command: >-
|
|
||||||
+ realm join -U {{ ad_integration_user | quote }} --membership-software
|
|
||||||
+ {{ ad_integration_membership_software | quote }}
|
|
||||||
+ {{ ad_integration_join_parameters }}
|
|
||||||
+ {{ ad_integration_realm | quote }}
|
|
||||||
+ __ad_integration_debug_command: >-
|
|
||||||
+ realm join -U {{ ad_integration_user | quote }} --membership-software
|
|
||||||
+ {{ ad_integration_membership_software | quote }}
|
|
||||||
+ {{ ad_integration_realm | quote }}
|
|
||||||
no_log: true
|
|
||||||
- when:
|
|
||||||
- - ad_integration_join_to_dc is none
|
|
||||||
+ when: ad_integration_join_to_dc is none
|
|
||||||
|
|
||||||
- name: Show the join command for debug
|
|
||||||
debug:
|
|
||||||
- msg: "Would run: '{{ __ad_integration_join_command }}'"
|
|
||||||
+ msg:
|
|
||||||
+ - >-
|
|
||||||
+ Would run the following command. Note that
|
|
||||||
+ ad_integration_join_parameters have been removed for security purposes,
|
|
||||||
+ the role will pass them to the actual realm join command when running
|
|
||||||
+ without check mode.
|
|
||||||
+ - "{{ __ad_integration_debug_command }}"
|
|
||||||
when:
|
|
||||||
- ad_integration_join_to_dc == __ad_integration_sample_dc
|
|
||||||
or ad_integration_realm == __ad_integration_sample_realm
|
|
||||||
or ansible_check_mode
|
|
||||||
|
|
||||||
- name: Run realm join command
|
|
||||||
- # noqa command-instead-of-shell
|
|
||||||
- shell: "{{ __ad_integration_join_command }}"
|
|
||||||
+ command: "{{ __ad_integration_join_command }}"
|
|
||||||
+ args:
|
|
||||||
+ stdin: "{{ ad_integration_password }}"
|
|
||||||
no_log: true
|
|
||||||
when:
|
|
||||||
- ad_integration_join_to_dc != __ad_integration_sample_dc
|
|
||||||
--
|
|
||||||
2.41.0
|
|
||||||
|
|
||||||
@ -1,10 +1,10 @@
|
|||||||
Source801: https://galaxy.ansible.com/download/ansible-posix-1.5.4.tar.gz
|
Source801: https://galaxy.ansible.com/download/ansible-posix-1.5.4.tar.gz
|
||||||
Source901: https://galaxy.ansible.com/download/community-general-7.3.0.tar.gz
|
Source901: https://galaxy.ansible.com/download/community-general-9.3.0.tar.gz
|
||||||
Source902: https://galaxy.ansible.com/download/containers-podman-1.10.3.tar.gz
|
Source902: https://galaxy.ansible.com/download/containers-podman-1.15.4.tar.gz
|
||||||
|
|
||||||
Provides: bundled(ansible-collection(ansible.posix)) = 1.5.4
|
Provides: bundled(ansible-collection(ansible.posix)) = 1.5.4
|
||||||
Provides: bundled(ansible-collection(community.general)) = 7.3.0
|
Provides: bundled(ansible-collection(community.general)) = 9.3.0
|
||||||
Provides: bundled(ansible-collection(containers.podman)) = 1.10.3
|
Provides: bundled(ansible-collection(containers.podman)) = 1.15.4
|
||||||
|
|
||||||
Source996: CHANGELOG.rst
|
Source996: CHANGELOG.rst
|
||||||
Source998: collection_readme.sh
|
Source998: collection_readme.sh
|
||||||
|
|||||||
@ -1,104 +1,152 @@
|
|||||||
# Unpack tar.gz to retrieve to be vendored modules and place them in the roles library.
|
# maps the source file to the roles that use that file
|
||||||
# ansible.posix:
|
# value can be string or space delimited list of strings
|
||||||
# - library:
|
# role name `__collection` means - do not vendor into
|
||||||
# - Module selinux and seboolean for the selinux role
|
# role, just vendor directly into the collection
|
||||||
# - Module mount for the storage role
|
declare -A plugin_map=(
|
||||||
declare -A module_map=( ["selinux.py"]="selinux" ["seboolean.py"]="selinux" ["mount.py"]="storage" )
|
[ansible/posix/plugins/modules/selinux.py]=selinux
|
||||||
for module in "${!module_map[@]}"; do
|
[ansible/posix/plugins/modules/seboolean.py]=selinux
|
||||||
role="${module_map[${module}]}"
|
[ansible/posix/plugins/modules/mount.py]=storage
|
||||||
if [ ! -d $role/library ]; then
|
[ansible/posix/plugins/modules/rhel_facts.py]=__collection
|
||||||
mkdir $role/library
|
[ansible/posix/plugins/modules/rhel_rpm_ostree.py]=__collection
|
||||||
fi
|
[ansible/posix/plugins/module_utils/mount.py]=storage
|
||||||
cp -pL .external/ansible/posix/plugins/modules/$module $role/library/$module
|
[community/general/plugins/modules/ini_file.py]="tlog ad_integration"
|
||||||
sed -i -e ':a;N;$!ba;s/description:\n\( *\)/description:\n\1- WARNING: Do not use this module directly! It is only for role internal use.\n\1/' -e "s/ansible_collections.ansible.posix.plugins.module_utils/ansible.module_utils.${role}_lsr/" $role/library/$module
|
[community/general/plugins/modules/modprobe.py]=ha_cluster
|
||||||
done
|
[community/general/plugins/modules/redhat_subscription.py]=rhc
|
||||||
|
[community/general/plugins/modules/rhsm_release.py]=rhc
|
||||||
|
[community/general/plugins/modules/rhsm_repository.py]=rhc
|
||||||
|
[community/general/plugins/modules/seport.py]=selinux
|
||||||
|
[community/general/plugins/modules/sefcontext.py]=selinux
|
||||||
|
[community/general/plugins/modules/selogin.py]=selinux
|
||||||
|
[containers/podman/plugins/modules/podman_container_info.py]=podman
|
||||||
|
[containers/podman/plugins/modules/podman_image.py]=podman
|
||||||
|
[containers/podman/plugins/modules/podman_play.py]=podman
|
||||||
|
[containers/podman/plugins/modules/podman_secret.py]=podman
|
||||||
|
[containers/podman/plugins/module_utils/podman/common.py]=podman
|
||||||
|
[containers/podman/plugins/module_utils/podman/quadlet.py]=podman
|
||||||
|
)
|
||||||
|
|
||||||
|
# fix the following issue
|
||||||
|
# ERROR: Found 1 pylint issue(s) which need to be resolved:
|
||||||
|
# ERROR: plugins/modules/rhsm_repository.py:263:8: wrong-collection-deprecated: Wrong collection name ('community.general') found in call to Display.deprecated or AnsibleModule.deprecate
|
||||||
|
sed "s/collection_name='community.general'/collection_name='%{collection_namespace}.%{collection_name}'/" \
|
||||||
|
-i .external/community/general/plugins/modules/rhsm_repository.py
|
||||||
|
|
||||||
# ansible.posix:
|
fix_module_documentation() {
|
||||||
# - module_utils:
|
local module_src doc_fragment_name df_dest_dir
|
||||||
# - Module_util mount for the storage role
|
local -a paths
|
||||||
module_map=( ["mount.py"]="storage" )
|
module_src=".external/$1"
|
||||||
for module in "${!module_map[@]}"; do
|
sed ':a;N;$!ba;s/description:\n\( *\)/description:\n\1- "WARNING: Do not use this plugin directly! It is only for role internal use."\n\1/' \
|
||||||
role="${module_map[${module}]}"
|
-i "$module_src"
|
||||||
if [ ! -d $role/module_utils/${role}_lsr ]; then
|
# grab documentation fragments
|
||||||
mkdir -p $role/module_utils/${role}_lsr
|
for doc_fragment_name in $(awk -F'[ -]+' '/^extends_documentation_fragment:/ {reading = 1; next}; /^[ -]/ {if (reading) {print $2}; next}; /^[^ -]/ {if (reading) {exit}}' "$module_src"); do
|
||||||
|
if [ "$doc_fragment_name" = files ]; then continue; fi # this one is built-in
|
||||||
|
df_dest_dir="%{collection_build_path}/plugins/doc_fragments"
|
||||||
|
if [ ! -d "$df_dest_dir" ]; then
|
||||||
|
mkdir -p "$df_dest_dir"
|
||||||
fi
|
fi
|
||||||
cp -pL .external/ansible/posix/plugins/module_utils/$module $role/module_utils/${role}_lsr/$module
|
paths=(${doc_fragment_name//./ })
|
||||||
|
# if we ever have two different collections that have the same doc_fragment name
|
||||||
|
# with different contents, we will be in trouble . . .
|
||||||
|
# will have to make the doc fragment files unique, then edit $dest to use
|
||||||
|
# the unique name
|
||||||
|
cp ".external/${paths[0]}/${paths[1]}/plugins/doc_fragments/${paths[2]}.py" "$df_dest_dir"
|
||||||
done
|
done
|
||||||
|
}
|
||||||
|
|
||||||
# community.general:
|
declare -a modules mod_utils collection_plugins
|
||||||
# - library:
|
declare -A dests
|
||||||
# - Module seport, sefcontext and selogin for the selinux role rolename2
|
# vendor in plugin files - fix documentation, fragments
|
||||||
# - Module ini_file for role tlog
|
for src in "${!plugin_map[@]}"; do
|
||||||
# - rhc modules
|
roles="${plugin_map["$src"]}"
|
||||||
# - ha_cluster uses modprobe
|
if [ "$roles" = __collection ]; then
|
||||||
module_map=( ["seport.py"]="selinux" ["sefcontext.py"]="selinux" ["selogin.py"]="selinux" ["ini_file.py"]="tlog"
|
collection_plugins+=("$src")
|
||||||
["redhat_subscription.py"]="rhc" ["rhsm_release.py"]="rhc" ["rhsm_repository.py"]="rhc"
|
case "$src" in
|
||||||
["modprobe.py"]="ha_cluster" )
|
*/plugins/modules/*) fix_module_documentation "$src";;
|
||||||
for module in "${!module_map[@]}"; do
|
esac
|
||||||
role="${module_map[${module}]}"
|
else
|
||||||
if [ ! -d $role/library ]; then
|
case "$src" in
|
||||||
mkdir $role/library
|
*/plugins/modules/*) srcdir=plugins/modules; subdir=library; modules+=("$src"); fix_module_documentation "$src";;
|
||||||
|
*/plugins/module_utils/*) srcdir=plugins/module_utils; mod_utils+=("$src") ;;
|
||||||
|
*/plugins/action/*) srcdir=plugins/action ;;
|
||||||
|
esac
|
||||||
fi
|
fi
|
||||||
# version 5.x seems to be broken?
|
for role in $roles; do
|
||||||
moduledir=.external/community/general/plugins/modules
|
if [ "$role" = __collection ]; then
|
||||||
if [ ! -f $moduledir/$module ]; then
|
dest="%{collection_build_path}/plugins${src/#*plugins/}"
|
||||||
moduledir=.external/community/general/plugins/modules/system
|
dests["$dest"]=__collection
|
||||||
|
else
|
||||||
|
case "$src" in
|
||||||
|
*/plugins/module_utils/*) subdir="module_utils/${role}_lsr" ;;
|
||||||
|
esac
|
||||||
|
dest="$role/${src/#*${srcdir}/${subdir}}"
|
||||||
|
dests["$dest"]="$role"
|
||||||
fi
|
fi
|
||||||
if [ ! -f $moduledir/$module ]; then
|
destdir="$(dirname "$dest")"
|
||||||
moduledir=.external/community/general/plugins/modules/files
|
if [ ! -d "$destdir" ]; then
|
||||||
|
mkdir -p "$destdir"
|
||||||
fi
|
fi
|
||||||
cp -pL $moduledir/$module $role/library/$module
|
cp -pL ".external/$src" "$dest"
|
||||||
ls -alrtF $role/library/$module
|
|
||||||
sed -i -e ':a;N;$!ba;s/description:\n\( *\)/description:\n\1- WARNING: Do not use this module directly! It is only for role internal use.\n\1/' $role/library/$module
|
|
||||||
|
|
||||||
# Remove doc_fragments
|
|
||||||
sed -i '/^extends_documentation_fragment:/,/^[^ -]/{/^extends/d;/^[ -]/d}' $role/library/$module
|
|
||||||
done
|
done
|
||||||
|
|
||||||
# containers.podman:
|
|
||||||
# - library:
|
|
||||||
# - Module podman_container_info, podman_image and podman_play for the podman role
|
|
||||||
module_map=( ["podman_container_info.py"]="podman" ["podman_image.py"]="podman" ["podman_play.py"]="podman"
|
|
||||||
["podman_secret.py"]="podman" )
|
|
||||||
for module in "${!module_map[@]}"; do
|
|
||||||
role="${module_map[${module}]}"
|
|
||||||
if [ ! -d $role/library ]; then
|
|
||||||
mkdir $role/library
|
|
||||||
fi
|
|
||||||
moduledir=.external/containers/podman/plugins/modules
|
|
||||||
cp -pL $moduledir/$module $role/library/$module
|
|
||||||
ls -alrtF $role/library/$module
|
|
||||||
sed -i -e ':a;N;$!ba;s/description:\n\( *\)/description:\n\1- WARNING: Do not use this module directly! It is only for role internal use.\n\1/' \
|
|
||||||
-e "s/ansible_collections.containers.podman.plugins.module_utils.podman/ansible.module_utils.${role}_lsr/" \
|
|
||||||
$role/library/$module
|
|
||||||
done
|
|
||||||
|
|
||||||
# containers.podman:
|
|
||||||
# - module_utils:
|
|
||||||
# - Module_util common for the podman role
|
|
||||||
module_map=( ["common.py"]="podman" )
|
|
||||||
for module in "${!module_map[@]}"; do
|
|
||||||
role="${module_map[${module}]}"
|
|
||||||
if [ ! -d $role/module_utils/${role}_lsr ]; then
|
|
||||||
mkdir -p $role/module_utils/${role}_lsr
|
|
||||||
fi
|
|
||||||
cp -pL .external/containers/podman/plugins/module_utils/podman/$module $role/module_utils/${role}_lsr/$module
|
|
||||||
done
|
done
|
||||||
|
|
||||||
# remove the temporary .external directory after vendoring
|
# remove the temporary .external directory after vendoring
|
||||||
rm -rf .external
|
rm -rf .external
|
||||||
|
|
||||||
|
# fix python imports to point from the old name to the new name
|
||||||
|
for dest in "${!dests[@]}"; do
|
||||||
|
role="${dests["$dest"]}"
|
||||||
|
for module in "${modules[@]}"; do
|
||||||
|
python_name="$(dirname "$module")"
|
||||||
|
python_name="${python_name////[.]}"
|
||||||
|
sed -e "s/ansible_collections[.]${python_name}[.]/ansible.modules./" -i "$dest"
|
||||||
|
done
|
||||||
|
for mod_util in "${mod_utils[@]}"; do
|
||||||
|
# some mod_utils have subdirs, some do not
|
||||||
|
split=(${mod_util//// })
|
||||||
|
python_name="ansible_collections[.]${split[0]}[.]${split[1]}[.]plugins[.]module_utils[.]"
|
||||||
|
sed -e "s/${python_name}/ansible.module_utils.${role}_lsr./" -i "$dest"
|
||||||
|
done
|
||||||
|
for plugin in "${collection_plugins[@]}"; do
|
||||||
|
python_name="$(dirname "$plugin")"
|
||||||
|
dest_python_name="%{collection_namespace}/%{collection_name}/plugins${python_name/#*plugins/}"
|
||||||
|
src_python_name="ansible_collections.${python_name////[.]}"
|
||||||
|
dest_python_name="ansible_collections.${dest_python_name////.}"
|
||||||
|
sed -e "s/${src_python_name}/${dest_python_name}/" -i "$dest"
|
||||||
|
done
|
||||||
|
done
|
||||||
|
|
||||||
# Replacing "linux-system-roles.rolename" with "rhel-system-roles.rolename" in each role
|
# Replacing "linux-system-roles.rolename" with "rhel-system-roles.rolename" in each role
|
||||||
# Replacing "fedora.linux_system_roles." with "redhat.rhel_system_roles" in each role
|
# Replacing "fedora.linux_system_roles." with "redhat.rhel_system_roles" in each role
|
||||||
# This is for the "roles calling other roles" case
|
# This is for the "roles calling other roles" case
|
||||||
# for podman, change the FQCN - using a non-FQCN module name doesn't seem to work,
|
# for podman, change the FQCN - using a non-FQCN module name doesn't seem to work,
|
||||||
# even for the legacy role format
|
# even for the legacy role format
|
||||||
# replace community.general for rhc
|
|
||||||
for rolename in %{rolenames}; do
|
for rolename in %{rolenames}; do
|
||||||
find $rolename -type f -exec \
|
find "$rolename" -type f -exec \
|
||||||
sed -e "s/linux-system-roles[.]${rolename}\\>/%{roleinstprefix}${rolename}/g" \
|
sed -e "s/linux-system-roles[.]${rolename}\\>/%{roleinstprefix}${rolename}/g" \
|
||||||
-e "s/fedora[.]linux_system_roles[.]/%{collection_namespace}.%{collection_name}./g" \
|
-e "s/fedora[.]linux_system_roles[.]/%{collection_namespace}.%{collection_name}./g" \
|
||||||
-e "s/containers[.]podman[.]/%{collection_namespace}.%{collection_name}./g" \
|
-e "s/containers[.]podman[.]/%{collection_namespace}.%{collection_name}./g" \
|
||||||
-e "s/community[.]general[.]/%{collection_namespace}.%{collection_name}./g" \
|
-e "s/community[.]general[.]/%{collection_namespace}.%{collection_name}./g" \
|
||||||
|
-e "s/ansible[.]posix[.]/%{collection_namespace}.%{collection_name}./g" \
|
||||||
-i {} \;
|
-i {} \;
|
||||||
done
|
done
|
||||||
|
|
||||||
|
# add ansible-test ignores needed due to vendoring
|
||||||
|
for ansible_ver in 2.14 2.15 2.16; do
|
||||||
|
ignore_file="podman/.sanity-ansible-ignore-${ansible_ver}.txt"
|
||||||
|
cat >> "$ignore_file" <<EOF
|
||||||
|
plugins/module_utils/podman_lsr/podman/quadlet.py compile-2.7!skip
|
||||||
|
plugins/module_utils/podman_lsr/podman/quadlet.py import-2.7!skip
|
||||||
|
plugins/modules/podman_image.py import-2.7!skip
|
||||||
|
plugins/modules/podman_play.py import-2.7!skip
|
||||||
|
EOF
|
||||||
|
done
|
||||||
|
# these platforms still use python 3.5
|
||||||
|
for ansible_ver in 2.14 2.15; do
|
||||||
|
ignore_file="podman/.sanity-ansible-ignore-${ansible_ver}.txt"
|
||||||
|
cat >> "$ignore_file" <<EOF
|
||||||
|
plugins/module_utils/podman_lsr/podman/quadlet.py compile-3.5!skip
|
||||||
|
plugins/module_utils/podman_lsr/podman/quadlet.py import-3.5!skip
|
||||||
|
plugins/modules/podman_image.py import-3.5!skip
|
||||||
|
plugins/modules/podman_play.py import-3.5!skip
|
||||||
|
EOF
|
||||||
|
done
|
||||||
|
|||||||
Loading…
Reference in new issue