From cfd8721a364f569caff90cb89d05683dd5eeb29e Mon Sep 17 00:00:00 2001 From: Mike DePaulo Date: Fri, 31 Jan 2020 15:20:22 -0500 Subject: [PATCH 1/3] Problem: ansible-pulp fails to upgrade plugins via the upgrade variable Solution: call item.value.upgrade rather than item.upgrade in the ansible task that uses the pulp_install_plugins data structure. fixes: #6078 ansible-pulp fails to upgrade plugins via the upgrade variable https://pulp.plan.io/issues/6078 --- roles/pulp/tasks/install.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/pulp/tasks/install.yml b/roles/pulp/tasks/install.yml index 0d80aec6d..f22dbb5a5 100644 --- a/roles/pulp/tasks/install.yml +++ b/roles/pulp/tasks/install.yml @@ -247,7 +247,7 @@ name: '{{ item.key }}' # item.upgrade true/false -> ansible pip module latest/present -> # pip command "install --upgrade"/"install" - state: "{{ item.upgrade | default(false) | ternary('latest','present','present') }}" + state: "{{ item.value.upgrade | default(false) | ternary('latest','present','present') }}" # TODO: Handle the fact that "version is incompatible with state=latest" # through proper means, rather than just telling users not to set both. version: '{{ item.value.version | default(omit) }}' From 20f80d75a2b52c921a495f42854448f142f198b6 Mon Sep 17 00:00:00 2001 From: Mike DePaulo Date: Fri, 31 Jan 2020 15:39:47 -0500 Subject: [PATCH 2/3] Bump version of ansible-pulp: 3.0.1-2 [noissue] --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 48a05a9bf..d151d2fb0 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ component of Pulp. The roles are not currently available on Ansible Galaxy; to r Ansible installer, the [ansible-pulp](https://github.com/pulp/ansible-pulp) git repository must be cloned or downloaded. -This version of the installer, 3.0.1-1, installs Pulp 3.0.1 specifically. +This version of the installer, 3.0.1-2, installs Pulp 3.0.1 specifically. If run against an older version of Pulp 3, it will upgrade it to 3.0.1. From 9bb3fffee1dd2a61a5415b46a43e2909f6952033 Mon Sep 17 00:00:00 2001 From: Mike DePaulo Date: Fri, 31 Jan 2020 11:16:08 -0500 Subject: [PATCH 3/3] Version bump to 3.1.0 [noissue] --- README.md | 4 ++-- roles/pulp/defaults/main.yml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index d151d2fb0..ab9bcc2b7 100644 --- a/README.md +++ b/README.md @@ -6,9 +6,9 @@ component of Pulp. The roles are not currently available on Ansible Galaxy; to r Ansible installer, the [ansible-pulp](https://github.com/pulp/ansible-pulp) git repository must be cloned or downloaded. -This version of the installer, 3.0.1-2, installs Pulp 3.0.1 specifically. +This version of the installer, 3.1.0, installs Pulp 3.1.0 specifically. -If run against an older version of Pulp 3, it will upgrade it to 3.0.1. +If run against an older version of Pulp 3, it will upgrade it to 3.1.0. System Requirements ------------------- diff --git a/roles/pulp/defaults/main.yml b/roles/pulp/defaults/main.yml index ef02a17dd..e76161003 100644 --- a/roles/pulp/defaults/main.yml +++ b/roles/pulp/defaults/main.yml @@ -24,7 +24,7 @@ pulp_upgrade: false # they are confident that this version of ansible-pulp is compatible with # pulp_version. # Ignored if pulp_source_dir is set -pulp_version: "3.0.1" +pulp_version: "3.1.0" pulp_user: pulp pulp_user_id: pulp_group: pulp