File tree 4 files changed +26
-10
lines changed
4 files changed +26
-10
lines changed Original file line number Diff line number Diff line change @@ -1862,7 +1862,8 @@ Data type: `Optional[String]`
1862
1862
The URL to download the Puppet Enterprise installer media from. If not
1863
1863
specified, PEAdm will attempt to download PE installation media from its
1864
1864
standard public source. When specified, PEAdm will download directly from the
1865
- URL given.
1865
+ URL given. Can be an URL, that ends with a /, to a web directory that
1866
+ contains the original archives or an absolute URL to the .tar.gz archive.
1866
1867
1867
1868
Default value: ` undef `
1868
1869
@@ -2324,7 +2325,8 @@ Data type: `Optional[String]`
2324
2325
The URL to download the Puppet Enterprise installer media from. If not
2325
2326
specified, PEAdm will attempt to download PE installation media from its
2326
2327
standard public source. When specified, PEAdm will download directly from the
2327
- URL given.
2328
+ URL given. Can be an URL, that ends with a /, to a web directory that
2329
+ contains the original archives or an absolute URL to the .tar.gz archive.
2328
2330
2329
2331
Default value: ` undef `
2330
2332
Original file line number Diff line number Diff line change 15
15
# The URL to download the Puppet Enterprise installer media from. If not
16
16
# specified, PEAdm will attempt to download PE installation media from its
17
17
# standard public source. When specified, PEAdm will download directly from the
18
- # URL given.
18
+ # URL given. Can be an URL, that ends with a /, to a web directory that
19
+ # contains the original archives or an absolute URL to the .tar.gz archive.
19
20
# @param ldap_config
20
21
# If specified, configures PE RBAC DS with the supplied configuration hash.
21
22
# The parameter should be set to a valid set of connection settings as
Original file line number Diff line number Diff line change 32
32
# The URL to download the Puppet Enterprise installer media from. If not
33
33
# specified, PEAdm will attempt to download PE installation media from its
34
34
# standard public source. When specified, PEAdm will download directly from the
35
- # URL given.
35
+ # URL given. Can be an URL, that ends with a /, to a web directory that
36
+ # contains the original archives or an absolute URL to the .tar.gz archive.
36
37
#
37
38
plan peadm::subplans::install (
38
39
# Standard
229
230
}
230
231
231
232
if $pe_installer_source {
232
- $pe_tarball_name = $pe_installer_source .split(' /' )[-1]
233
- $pe_tarball_source = $pe_installer_source
233
+ if $pe_installer_source [-1] == ' /' {
234
+ $pe_tarball_name = " puppet-enterprise-${version} -${platform} .tar.gz"
235
+ $pe_tarball_source = " ${pe_installer_source}${pe_tarball_name} "
236
+ } else {
237
+ $pe_tarball_name = $pe_installer_source .split(' /' )[-1]
238
+ $pe_tarball_source = $pe_installer_source
239
+ }
234
240
} else {
235
241
$pe_tarball_name = " puppet-enterprise-${version} -${platform} .tar.gz"
236
242
$pe_tarball_source = " https://s3.amazonaws.com/pe-builds/released/${version} /${pe_tarball_name} "
Original file line number Diff line number Diff line change 15
15
# The URL to download the Puppet Enterprise installer media from. If not
16
16
# specified, PEAdm will attempt to download PE installation media from its
17
17
# standard public source. When specified, PEAdm will download directly from the
18
- # URL given.
18
+ # URL given. Can be an URL, that ends with a /, to a web directory that
19
+ # contains the original archives or an absolute URL to the .tar.gz archive.
19
20
# @param final_agent_state
20
21
# Configures the state the puppet agent should be in on infrastructure nodes
21
22
# after PE is upgraded successfully.
118
119
$platform = run_task(' peadm::precheck' , $primary_target ).first[' platform' ]
119
120
120
121
if $pe_installer_source {
121
- $pe_tarball_name = $pe_installer_source .split(' /' )[-1]
122
- $pe_tarball_source = $pe_installer_source
123
- $_version = $pe_tarball_name .split(' -' )[2]
122
+ if $pe_installer_source [-1] == ' /' {
123
+ $_version = $version
124
+ $pe_tarball_name = " puppet-enterprise-${_version}-${platform} .tar.gz"
125
+ $pe_tarball_source = " ${pe_installer_source}${pe_tarball_name} "
126
+ } else {
127
+ $pe_tarball_name = $pe_installer_source .split(' /' )[-1]
128
+ $pe_tarball_source = $pe_installer_source
129
+ $_version = $pe_tarball_name .split(' -' )[2]
130
+ }
124
131
} else {
125
132
$_version = $version
126
133
$pe_tarball_name = " puppet-enterprise-${_version}-${platform} .tar.gz"
You can’t perform that action at this time.
0 commit comments