diff --git a/CHANGES/8158.bugfix b/CHANGES/8158.bugfix deleted file mode 100644 index b7b1af280..000000000 --- a/CHANGES/8158.bugfix +++ /dev/null @@ -1,2 +0,0 @@ -Fix the installer (versioned 3.9.1-x) still installing pulpcore 3.9.0 instead of 3.9.1. - diff --git a/CHANGES/8163.feature b/CHANGES/8163.feature deleted file mode 100644 index d3842dadc..000000000 --- a/CHANGES/8163.feature +++ /dev/null @@ -1 +0,0 @@ -Install the Linux distro's `gpg` binary command for the new SigningService functionality in pulpcore. diff --git a/docs/CHANGES.md b/docs/CHANGES.md index 6a4b455dd..fe857a05b 100644 --- a/docs/CHANGES.md +++ b/docs/CHANGES.md @@ -13,6 +13,27 @@ Changelog +3.9.1-1 (2021-01-27) +==================== + + +Features +-------- + +- Install the Linux distro's `gpg` binary command for the new SigningService functionality in pulpcore. + [#8163](https://pulp.plan.io/issues/8163) + + +Bugfixes +-------- + +- Fix the installer (versioned 3.9.1-x) still installing pulpcore 3.9.0 instead of 3.9.1. + [#8158](https://pulp.plan.io/issues/8158) + + +---- + + 3.9.1 (2021-01-21) ================== diff --git a/docs/index.md b/docs/index.md index 2a4a42481..12d611f8b 100644 --- a/docs/index.md +++ b/docs/index.md @@ -5,7 +5,7 @@ The Pulp 3 Ansible installer is a collection of Ansible roles that you can use t Each Ansible role installs and configures a component of Pulp. -This version of the installer, 3.9.1, installs Pulp 3.9.1 specifically. +This version of the installer, 3.9.1-1, installs Pulp 3.9.1 specifically. If run against an older version of Pulp 3, it will upgrade it to 3.9.1. diff --git a/galaxy.yml b/galaxy.yml index 47aedb7e6..89e5f4654 100644 --- a/galaxy.yml +++ b/galaxy.yml @@ -10,7 +10,7 @@ namespace: pulp name: pulp_installer # The version of the collection. Must be compatible with semantic versioning -version: 3.9.1 +version: 3.9.1-1 # The path to the Markdown (.md) readme file. This path is relative to the root of the collection readme: README.md diff --git a/roles/pulp_common/vars/main.yml b/roles/pulp_common/vars/main.yml index db63cd176..5e8712115 100644 --- a/roles/pulp_common/vars/main.yml +++ b/roles/pulp_common/vars/main.yml @@ -42,7 +42,7 @@ __pulp_common_pulp_settings_fips_defaults: - sha512 __pulp_common_merged_pulp_settings: "{{ __pulp_common_pulp_settings_defaults | combine(ansible_fips | ternary(__pulp_common_pulp_settings_fips_defaults, {}), pulp_settings, recursive=True) }}" -__pulp_version: '{{ pulpcore_version | default("3.9.0") }}' +__pulp_version: '{{ pulpcore_version | default("3.9.1") }}' # Pulps own replacement for django-admin setup in the proper environment pulp_django_admin_path: "{{ pulp_install_dir }}/bin/pulpcore-manager"