Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

change default pe tarball paths #375

Closed
wants to merge 1 commit into from
Closed

change default pe tarball paths #375

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
20 changes: 19 additions & 1 deletion REFERENCE.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1552,6 +1552,7 @@ The following parameters are available in the `peadm::install` plan:
* [`license_key_file`](#-peadm--install--license_key_file)
* [`license_key_content`](#-peadm--install--license_key_content)
* [`stagingdir`](#-peadm--install--stagingdir)
* [`uploaddir`](#-peadm--install--uploaddir)
* [`download_mode`](#-peadm--install--download_mode)
* [`permit_unsafe_versions`](#-peadm--install--permit_unsafe_versions)
* [`token_lifetime`](#-peadm--install--token_lifetime)
Expand Down Expand Up @@ -1746,6 +1747,14 @@ Data type: `Optional[String]`



Default value: `undef`

##### <a name="-peadm--install--uploaddir"></a>`uploaddir`

Data type: `Optional[String]`



Default value: `undef`

##### <a name="-peadm--install--download_mode"></a>`download_mode`
Expand Down Expand Up @@ -1913,6 +1922,7 @@ The following parameters are available in the `peadm::upgrade` plan:
* [`version`](#-peadm--upgrade--version)
* [`token_file`](#-peadm--upgrade--token_file)
* [`stagingdir`](#-peadm--upgrade--stagingdir)
* [`uploaddir`](#-peadm--upgrade--uploaddir)
* [`download_mode`](#-peadm--upgrade--download_mode)
* [`permit_unsafe_versions`](#-peadm--upgrade--permit_unsafe_versions)
* [`begin_at_step`](#-peadm--upgrade--begin_at_step)
Expand Down Expand Up @@ -2026,7 +2036,15 @@ Data type: `String`



Default value: `'/tmp'`
Default value: `'/var/tmp'`

##### <a name="-peadm--upgrade--uploaddir"></a>`uploaddir`

Data type: `String`



Default value: `'/var/tmp'`

##### <a name="-peadm--upgrade--download_mode"></a>`download_mode`

Expand Down
2 changes: 2 additions & 0 deletions plans/install.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@

# Other
Optional[String] $stagingdir = undef,
Optional[String] $uploaddir = undef,
Enum['running', 'stopped'] $final_agent_state = 'running',
Enum['direct', 'bolthost'] $download_mode = 'bolthost',
Boolean $permit_unsafe_versions = false,
Expand Down Expand Up @@ -101,6 +102,7 @@

# Other
stagingdir => $stagingdir,
uploaddir => $uploaddir,
download_mode => $download_mode,
permit_unsafe_versions => $permit_unsafe_versions,
token_lifetime => $token_lifetime,
Expand Down
5 changes: 3 additions & 2 deletions plans/subplans/install.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,8 @@
Optional[String] $license_key_content = undef,

# Other
String $stagingdir = '/tmp',
String $stagingdir = '/var/tmp',
String $uploaddir = '/var/tmp',
Enum[direct,bolthost] $download_mode = 'bolthost',
Boolean $permit_unsafe_versions = false,
String $token_lifetime = '1y',
Expand Down Expand Up @@ -211,7 +212,7 @@
$pe_tarball_source = "https://s3.amazonaws.com/pe-builds/released/${version}/${pe_tarball_name}"
}

$upload_tarball_path = "/tmp/${pe_tarball_name}"
$upload_tarball_path = "${uploaddir}/${pe_tarball_name}"

if $download_mode == 'bolthost' {
# Download the PE tarball and send it to the nodes that need it
Expand Down
5 changes: 3 additions & 2 deletions plans/upgrade.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,8 @@

# Other
Optional[String] $token_file = undef,
String $stagingdir = '/tmp',
String $stagingdir = '/var/tmp',
String $uploaddir = '/var/tmp',
Enum['running', 'stopped'] $final_agent_state = 'running',
Enum[direct,bolthost] $download_mode = 'bolthost',
Boolean $permit_unsafe_versions = false,
Expand Down Expand Up @@ -112,7 +113,7 @@
$pe_tarball_source = "https://s3.amazonaws.com/pe-builds/released/${_version}/${pe_tarball_name}"
}

$upload_tarball_path = "/tmp/${pe_tarball_name}"
$upload_tarball_path = "${uploaddir}/${pe_tarball_name}"

peadm::assert_supported_bolt_version()

Expand Down
Loading