Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion manifests/globals.pp
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@
Optional[String[1]] $version = undef,
Optional[String[1]] $client_version = undef,
Boolean $manage_package_repo = true,
String[1] $repo_version = '5.0',
Optional[String[1]] $repo_version = undef,
Boolean $use_enterprise_repo = false,
Optional[String] $repo_location = undef,
Optional[String] $keyring_location = undef,
Expand Down
2 changes: 1 addition & 1 deletion manifests/repo.pp
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
Optional[String[1]] $proxy_password = undef,
) {
if $version == undef and $repo_location == undef {
fail('`version` or `repo_location` is required')
$version = '5.0'
}
if $version != undef and $repo_location != undef {
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@mikhaildudzin please have a look at #779. I have removed this test so that $version is just ignored when $repo_location is set.

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, going to close this PR
Thanks for collaboration

fail('`version` is not supported with `repo_location`')
Expand Down