-
Notifications
You must be signed in to change notification settings - Fork 193
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.
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
(MODULES-4214) Add additional installation parameters during upgrade #204
(MODULES-4214) Add additional installation parameters during upgrade #204
Conversation
CLA signed by all contributors. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Commit messages seem a bit messed up.
{:install_options => ['OPTION1=value1','OPTION2=value2'],}) | ||
} | ||
|
||
it { is_expected.to compile.with_all_deps } |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This test doesn't seem to be working right.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Still a work in progress. Running spec test on Windows is difficult for this module.
b8883fb
to
dd906b9
Compare
Rebased all the bad commit messages. Still need to update the Readme |
dd906b9
to
d65162a
Compare
Is this finished? Didn't realize it'd been updated. |
README.markdown
Outdated
@@ -151,6 +151,14 @@ The directory the puppet agent should be installed to. This is only applicable f | |||
install_dir => 'D:\Program Files\Puppet Labs' | |||
``` | |||
|
|||
##### `install_options` | |||
|
|||
An array of additional options to pass when installing a package. These options are package-specific, and should be documented by the software vendor. One commonly implemented option is `INSTALLDIR` Each option in the array can either be a string or a hash, where each key and value pair are interpreted in a provider specific way. Each option will automatically be quoted when passed to the install command. With Windows packages, note that file paths in an install option must use backslashes. (Since install options are passed directly to the installation command, forward slashes won't be automatically converted like they are in `file` resources.) Note also that backslashes in double-quoted strings _must_ be escaped and backslashes in single-quoted strings _can_ be escaped. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Since we control the package, shouldn't we just point to where these options are defined (rather than say they "documented by the software vendor")?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Whoops. Copy-pasta fail from the package provider
d65162a
to
975343d
Compare
@MikaelSmith Documentation updated. |
manifests/init.pp
Outdated
@@ -35,6 +35,18 @@ | |||
# The directory the puppet agent should be installed to. This is only applicable for | |||
# windows operating systems. This only applies when upgrading the agent to a new | |||
# version; it will not cause re-installation of the same version to a new location. | |||
# [install_options] | |||
# An array of additional options to pass when installing a package. These |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Here too?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Nice pickup. Thanks. Fixed.
Previously it was not possible to pass additional installation parameters during an upgrade process. In the case of MSI files this could be sensitive passwords or other public MSI properties. In the case of package resources, additional options could not be added to the package resource. This commit adds a parameter called `install_options` which mirrors the `install_options` parameter from the package resource and then passes this down so that it is invoked on installation (either by a package resource or in the batch file to install the MSI)
975343d
to
458a747
Compare
Previously it was not possible to pass additional installation parameters during
an upgrade process. In the case of MSI files this could be sensitive passwords
or other public MSI properties. In the case of package resources, additional
options could not be added to the package resource.
This commit adds a parameter called
install_options
which mirrors theinstall_options
parameter from the package resource and then passes this downso that it is invoked on installation (either by a package resource or in the
batch file to install the MSI)