beckermj/vaguerent
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
10,311 Commits 2 Branches 273 Tags
Commit Graph

106 Commits

Author SHA1 Message Date
Jonathan LaBroad
56861296fa Added tests and validation for python_version parameter 2017-10-05 06:25:36 -04:00
Jonathan LaBroad
6f53c3991c Merge remote-tracking branch 'upstream/master' 2017-09-11 09:15:22 -04:00
Brian Cain
432cb8d915 (#7826) Add salt_arg option for passing flags to salt tool 
This commit introduces the salt_arg option that allows a user to pass
additional command line flags to the `salt` tool when provisioning with
a master setup.

It also adds additional config validation to ensure that both
`salt_args` and `salt_call_args` is an array.
 2017-08-29 14:11:06 -07:00
Brian Cain
9a29d7be6b (#7836) Introduce salt_call_args option for salt provisioner 
This config option for the salt provisioner allows you to pass
additional arguments to the salt-call executable.
 2017-08-29 11:17:29 -07:00
Jonathan LaBroad
8e2c66d8a8 Reverting whitespace change 2017-08-29 13:23:53 -04:00
Jonathan LaBroad
8e3831b810 Update default minion version to latest (Python 2) 
Perform check to determine to include python version or not
 2017-08-29 13:13:24 -04:00
Jonathan LaBroad
384848e92d Adding python_version parameter for Windows minions 
Ignoring non-Windows Salt parameters
Get the correct minion file for ver >= 2017.x.x
 2017-08-29 12:38:29 -04:00
Peter Parkkali
8e4f0444e8 Hide duplicate errors in Saltstack provisioner when verbose mode is on 2017-08-26 01:38:06 +02:00
Brian Cain
7a7506cd00 (#8789) Remove curl pipe bash install for salt provisioner 
Prior to this commit, because of how the bootstrap salt shell file
worked, if github could not be resolved, the installer script would fail
silently with an exit code 0 because `sh` would evalute without any
errors and the curl exit code would be ignored. This commit splits out
the installer to first attempt to save the bash installer, and if it
exists, execute it.
 2017-08-09 10:23:13 -07:00
Chris Roberts
d260fe7d38 Merge pull request #7865 from DavidWittman/7454-fix-salt-minion-id-config 
Fix minion_id config for salt provisioner
 2017-06-15 16:01:33 -07:00
Dafydd Jones
71216cf4f9 update latest salt minion version for windows 2017-04-13 12:36:45 -07:00
knbnnate
8c31a0c3ff Salt ver year.month can have 2-digit month 2017-03-30 17:00:46 -04:00
Chris Roberts
2219a4def0 Fix Hash construction for constant value in salt provisioner 2016-11-09 16:29:36 -08:00
Chris Roberts
dbbd2d8e36 Remove deprecated methods and update tests. 2016-11-07 18:48:14 -08:00
Chris Roberts
fa2a9105f0 provisioners/salt: Synchronize config defaults with documentation 2016-10-17 10:11:39 -07:00
David Wittman
00c7b1e005
Fix minion_id config for salt provisioner 
Changes introduced in #7207 removed the logic to handle the
`minion_id` configuration. This commit addresses that regression
by including the `--id #{@config.minion_id}` flag everywhere that
`--local` is used (as it had done before).

I'm not totally in love with the `get_masterless` abstraction here,
so if someone has a better suggestion I'll happily change it.

Fixes #7454
 2016-10-04 16:46:36 -05:00
Michael Sarahan
72e9f0fe10 move masterless config to apply to all platforms 2016-04-05 10:24:47 -05:00
Seth Miller
c8a18fda26 Fixing the Salt bootstrap script for Windows 
The URL for the download has changed as per issue #6274
 2015-11-18 21:55:32 -06:00
Mitchell Hashimoto
c43e0af4d7 Merge pull request #6382 from sophicware/fix/salt-provisioner-install-args 
[salt] [bugfix] Restablize Salt provisioner
 2015-11-18 15:19:02 -08:00
Mitchell Hashimoto
fbdb6c0d19 Merge pull request #6474 from aneeshusa/enable-salt-options-for-masterless 
Enable log_level and colorize for salt masterless
 2015-11-18 15:11:54 -08:00
Mitchell Hashimoto
fedc7e21b3 provisioners/salt: deprecate config_dir 2015-11-18 11:56:07 -08:00
Mitchell Hashimoto
6c250d023e Merge pull request #6073 from johntron/revert-74d22069 
Stop trying to upload minion config to privileged directory
 2015-11-18 11:52:06 -08:00
Mitchell Hashimoto
6639d56c9c Merge pull request #5999 from PatOShea/patch-4 
Correct salt-minion and call ext on windows guest
 2015-11-18 11:39:09 -08:00
Aneesh Agrawal
84408c1682 Enable log_level and colorize for salt masterless 2015-11-02 20:57:29 -05:00
Jurnell Cockhren
86e56aeac3 Revert "Salt Provisioner: Added a 'custom' option to install_type to allow more flexibility in passing arguments to the bootstrap script. Updated the docs." 
This reverts commit 0289ab986c053f7d3bc825142c82a07bcf0ae3ec.

Refers to issues #6276, #5973, #5936 and #5435

Conflicts:
	website/docs/source/v2/provisioning/salt.html.md
 2015-10-08 15:01:00 -05:00
Jurnell Cockhren
1a7c6dcfeb Revert "Salt Provisioner: refactor custom install_type option to add install_command instead" 
Refers to issues #6276, #5973, #5936 and #5435

This reverts commit 72e63767ac5807277dfe7f2202d3ab25804fe0df.

Conflicts:
	website/docs/source/v2/provisioning/salt.html.md
 2015-10-08 15:01:00 -05:00
Jurnell Cockhren
fb611c7389 Revert "Initialize the install_command salt config var" 
Refers to issues #6276, #5973 and #5936

This reverts commit ccd735466524e5cdea353714e06d9a3c88d17bdc.
 2015-10-08 15:01:00 -05:00
Jurnell Cockhren
70e9079449 Revert "Fix alignment of initializer" 
Refers to issues #6276, #5973 and #5936

This reverts commit 27d751863673435693b775bf44e79b9f688a8968.
 2015-10-08 15:01:00 -05:00
Jason Woods
ff941ef4e8 Fix broken masterless minion configuration 2015-08-03 12:11:32 +01:00
John Syrinek
ea7b277f41 Prevent fatal error caused by attempting to upload minion config to 
privileged directory
 2015-07-31 16:05:55 -05:00
Pat O'Shea
d34bc38bf3 Updated salt-minion and call ext on windows guest 
Salt-minion and salt-call are batch files on a windows guest, not executables.
 2015-07-18 20:53:46 -06:00
Mitchell Hashimoto
4b217e2128 Merge pull request #5980 from PatOShea/PatOShea-ConfigDir-Typo 
Fixed salt minion configuration directory typo
 2015-07-17 12:37:44 -07:00
Pat O'Shea
a4eede0c42 fixed typo for config_dir 
Only exposed when calling highstate with config_dir being set
 2015-07-16 18:45:59 -06:00
Pat O'Shea
956bbf011c Changed minion config path for windows 
Copy of minion is wrong on windows. Moved to sub-dir, conf.
 2015-07-16 18:37:36 -06:00
William Kral
27d7518636 Fix alignment of initializer 2015-07-11 10:40:17 -07:00
William Kral
ccd7354665 Initialize the install_command salt config var 2015-07-11 10:31:19 -07:00
Mitchell Hashimoto
d51c5fbc69 Merge pull request #5435 from juiceinc/bugfix/salt-provisioner 
Update Salt provisioner to allow more flexibility in passing arguments to the bootstrap script
 2015-07-09 15:02:34 -06:00
Pat O'Shea
da67824a53 Adding run_service and minion/master ids for windows 2015-07-07 00:24:23 -06:00
Mitchell Hashimoto
cc2d393611 Merge pull request #5892 from PatOShea/master 
provisioner/salt: Updated version for windows and added passing in version via vagrantfile
 2015-07-06 15:11:08 -06:00
Jeff Quast
1ac3d17773 bugfix: undefined local variable or method `dir' 
resolves bug introduced in 74d22069d41b35bae50e32c1c68a92a4958afebb
 2015-07-06 11:39:07 -07:00
Pat O'Shea
eab702da83 Adding config to set version to install 2015-07-04 01:25:31 -06:00
Tim O'Guin
72e63767ac Salt Provisioner: refactor custom install_type option to add install_command instead 2015-06-01 10:37:41 -05:00
Tim O'Guin
0b24866537 merged in master and resolved conflict in Salt provisioner docs 2015-06-01 10:07:28 -05:00
Seth Vargo
f5c77765fa Merge pull request #5437 from Jamezz/master 
Fix issue #4152: Salt minion bootstrapping
 2015-05-31 20:08:32 -07:00
Seth Vargo
b90807648b Style fixes 2015-05-31 10:19:03 -07:00
Seth Vargo
e34308ec12 Merge pull request #4371 from andrewmains12/salt_orchestrations 
Added ability to run salt orchestrations to Salt provisioner
 2015-05-31 10:17:54 -07:00
Seth Vargo
dadee77730 Merge pull request #5637 from paul-krohn/config-not-found-error 
Provide path to missing file.
 2015-05-30 11:55:25 -07:00
David Cournapeau
3528af2db9 ENH: simpler masterless configuration. 2015-05-30 11:42:15 -07:00
Seth Vargo
0b85e04399 Minor style fixes for salt config_dir 2015-05-30 11:39:24 -07:00
David Cournapeau
74d22069d4 BUG: naive attempt at fixing #2970. 2015-05-30 11:39:23 -07:00