Showing with 16 additions and 1 deletion.
  1. +8 −0 CHANGELOG.md
  2. +5 −0 manifests/admin.pp
  3. +1 −1 metadata.json
  4. +2 −0 spec/defines/admin_spec.rb
8 changes: 8 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,13 @@
# Changelog

## [3.2.1](https://github.com/theforeman/puppet-pulpcore/tree/3.2.1) (2021-04-15)

[Full Changelog](https://github.com/theforeman/puppet-pulpcore/compare/3.2.0...3.2.1)

**Fixed bugs:**

- Fixes [\#32309](https://projects.theforeman.org/issues/32309) - pulpcore-manager fails from certain directories [\#181](https://github.com/theforeman/puppet-pulpcore/pull/181) ([ianballou](https://github.com/ianballou))

## [3.2.0](https://github.com/theforeman/puppet-pulpcore/tree/3.2.0) (2021-03-24)

[Full Changelog](https://github.com/theforeman/puppet-pulpcore/compare/3.1.0...3.2.0)
Expand Down
5 changes: 5 additions & 0 deletions manifests/admin.pp
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,9 @@
# @param timeout
# The command should timeout after so many seconds.
#
# @param working_dir
# The directory to run pulpcore-manager from.
#
# @see exec
define pulpcore::admin(
String $command = $title,
Expand All @@ -32,11 +35,13 @@
String $user = $pulpcore::user,
Stdlib::Absolutepath $pulp_settings = $pulpcore::settings_file,
Optional[Integer[0]] $timeout = undef,
Stdlib::Absolutepath $working_dir = $pulpcore::user_home,
) {
Concat <| title == 'pulpcore settings' |>
-> exec { "pulpcore-manager ${command}":
user => $user,
path => $path,
cwd => $working_dir,
environment => ["PULP_SETTINGS=${pulp_settings}"],
refreshonly => $refreshonly,
unless => $unless,
Expand Down
2 changes: 1 addition & 1 deletion metadata.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "theforeman-pulpcore",
"version": "3.2.0",
"version": "3.2.1",
"author": "theforeman",
"summary": "Installs next generation Pulp server",
"license": "GPL-3.0-or-later",
Expand Down
2 changes: 2 additions & 0 deletions spec/defines/admin_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
{
pulp_settings: '/etc/pulpcore/settings.py',
user: 'pulpcore',
working_dir: '/var/lib/pulp'
}
end

Expand All @@ -22,6 +23,7 @@
.with_environment(['PULP_SETTINGS=/etc/pulpcore/settings.py'])
.with_refreshonly(false)
.with_unless(nil)
.with_cwd('/var/lib/pulp')
end
end

Expand Down