From 153de5ee4916dfcbe2d1957af7c099dc019c2a91 Mon Sep 17 00:00:00 2001 From: Abhijeet Kasurde Date: Wed, 17 Jun 2020 08:47:48 +0530 Subject: [PATCH] [2.9] podman_image: use correct option for remove_signatures flag (#68979) podman_image module uses 'podman push' command with wrong flag '--remove_signatures' instead of '--remove-signatures' This patch fixes the given typo. Fixes: ansible/ansible#67965 Signed-off-by: Abhijeet Kasurde --- changelogs/fragments/67965_podman_image.yml | 2 ++ lib/ansible/modules/cloud/podman/podman_image.py | 2 +- test/integration/targets/setup_podman/defaults/main.yml | 2 +- test/integration/targets/setup_podman/tasks/main.yml | 3 +++ test/integration/targets/setup_podman/vars/RedHat-7.yml | 1 + test/integration/targets/setup_podman/vars/RedHat-8.yml | 1 + test/integration/targets/setup_podman/vars/main.yml | 4 ++-- 7 files changed, 11 insertions(+), 4 deletions(-) create mode 100644 changelogs/fragments/67965_podman_image.yml create mode 100644 test/integration/targets/setup_podman/vars/RedHat-7.yml create mode 100644 test/integration/targets/setup_podman/vars/RedHat-8.yml diff --git a/changelogs/fragments/67965_podman_image.yml b/changelogs/fragments/67965_podman_image.yml new file mode 100644 index 00000000000..ada706c3a74 --- /dev/null +++ b/changelogs/fragments/67965_podman_image.yml @@ -0,0 +1,2 @@ +minor_changes: +- Fix a typo in remove_signature flag in podman_image module (https://github.com/ansible/ansible/issues/67965). diff --git a/lib/ansible/modules/cloud/podman/podman_image.py b/lib/ansible/modules/cloud/podman/podman_image.py index 7efd4b67c14..e2c4b216728 100644 --- a/lib/ansible/modules/cloud/podman/podman_image.py +++ b/lib/ansible/modules/cloud/podman/podman_image.py @@ -573,7 +573,7 @@ class PodmanImageManager(object): args.extend(['--format', push_format]) if self.push_args.get('remove_signatures'): - args.append('--remove_signatures') + args.append('--remove-signatures') sign_by_key = self.push_args.get('sign_by') if sign_by_key: diff --git a/test/integration/targets/setup_podman/defaults/main.yml b/test/integration/targets/setup_podman/defaults/main.yml index be888279874..604a139979a 100644 --- a/test/integration/targets/setup_podman/defaults/main.yml +++ b/test/integration/targets/setup_podman/defaults/main.yml @@ -1 +1 @@ -podman_package: podman-1.4.* +podman_package: podman-1.3.* diff --git a/test/integration/targets/setup_podman/tasks/main.yml b/test/integration/targets/setup_podman/tasks/main.yml index ab7b66f7d98..be4834e10fd 100644 --- a/test/integration/targets/setup_podman/tasks/main.yml +++ b/test/integration/targets/setup_podman/tasks/main.yml @@ -1,4 +1,7 @@ - block: + - name: Include distribution specific variables + include_vars: "{{ ansible_facts.distribution }}-{{ ansible_facts.distribution_major_version }}.yml" + - name: Enable extras repo command: "{{ repo_command[ansible_facts.distribution ~ ansible_facts.distribution_major_version]['enable'] | default('echo') }}" notify: cleanup podman diff --git a/test/integration/targets/setup_podman/vars/RedHat-7.yml b/test/integration/targets/setup_podman/vars/RedHat-7.yml new file mode 100644 index 00000000000..d838d74750c --- /dev/null +++ b/test/integration/targets/setup_podman/vars/RedHat-7.yml @@ -0,0 +1 @@ +podman_package: podman-1.3.* \ No newline at end of file diff --git a/test/integration/targets/setup_podman/vars/RedHat-8.yml b/test/integration/targets/setup_podman/vars/RedHat-8.yml new file mode 100644 index 00000000000..0621070ff44 --- /dev/null +++ b/test/integration/targets/setup_podman/vars/RedHat-8.yml @@ -0,0 +1 @@ +podman_package: '@container-tools:1.0' \ No newline at end of file diff --git a/test/integration/targets/setup_podman/vars/main.yml b/test/integration/targets/setup_podman/vars/main.yml index a79922f9fb2..2b814b74299 100644 --- a/test/integration/targets/setup_podman/vars/main.yml +++ b/test/integration/targets/setup_podman/vars/main.yml @@ -1,4 +1,4 @@ repo_command: RedHat7: - enable: yum-config-manager --enable rhui-REGION-rhel-server-extras - disable: yum-config-manager --disable rhui-REGION-rhel-server-extras + enable: yum-config-manager --enable rhui-REGION-rhel-server-extras rhui-rhel-7-server-rhui-extras-rpms + disable: yum-config-manager --disable rhui-REGION-rhel-server-extras rhui-rhel-7-server-rhui-extras-rpms