Move default version to repo.pp

mikhaildudzin · mikhaildudzin · commit 2d0765e4fe59 · 2024-10-29T16:36:30.000+02:00
diff --git a/manifests/globals.pp b/manifests/globals.pp
@@ -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,
diff --git a/manifests/repo.pp b/manifests/repo.pp
@@ -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 {
     fail('`version` is not supported with `repo_location`')

Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@`
`38`	`38`	`Optional[String[1]] $proxy_password = undef,`
`39`	`39`	`) {`
`40`	`40`	`if $version == undef and $repo_location == undef {`
`41`		- fail('`version` or `repo_location` is required')
	`41`	`+ $version = '5.0'`
`42`	`42`	`}`
`43`	`43`	`if $version != undef and $repo_location != undef {`
`44`	`44`	fail('`version` is not supported with `repo_location`')