Ryan Walder
db457e6318
Add master_json_config & minion_json_config options to salt provisioner
...
* Allow use of -j/-J bootstrap options for configuring master/minion
2018-01-31 12:28:36 +00:00
Brian Cain
a724a19a5d
Merge pull request #8992 from BenjaminSchiborr/fix/master/fix_salt_windows_bootstrap
...
provisioners/salt: Fixes timeout issue in salt bootstrapping for windows
2017-12-07 11:27:55 -08:00
Benjamin Schiborr
c30c00508c
provisioners/salt: #8991 : Fixes timeout issue in salt bootstrapping for windows
...
Fixes #8991 .
1. When remote executing scripts one should always call powershell with
1a. "-NonInteractive", in order to prevent interactive prompts from leading to an endless waiting time for the script to return
1b. "-NoProfile", in order to prevent the loading of unknown custom profiles before execution of the script which could have unintended side effects
2. During my tests I constantly ran into 408 timeouts when downloading the salt binaries. I've prevented that by adding a simple retry mechanism and an error exit in case of multiple failures. Without this change the bootstrap script never returned (and neither did vagrant up)
2017-09-22 18:08:30 -07: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
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
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
Chris Roberts
2219a4def0
Fix Hash construction for constant value in salt provisioner
2016-11-09 16:29:36 -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
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
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 0289ab986c
.
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 72e63767ac
.
Conflicts:
website/docs/source/v2/provisioning/salt.html.md
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
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 74d22069d4
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
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
David Cournapeau
3528af2db9
ENH: simpler masterless configuration.
2015-05-30 11:42:15 -07:00
David Cournapeau
74d22069d4
BUG: naive attempt at fixing #2970 .
2015-05-30 11:39:23 -07:00
Tim O'Guin
0289ab986c
Salt Provisioner: Added a 'custom' option to install_type to allow more flexibility in passing arguments to the bootstrap script. Updated the docs.
2015-03-04 15:05:24 -07:00
Andrew Mains
9aa20d5d6b
Added ability to run salt orchestrations to salt provisioner
2014-12-31 10:31:35 -08:00
Seth Vargo
8c8a92c4be
Merge pull request #4896 from analyzere/salt-grains-config
...
Issue #4895 : Support grains config for salt
2014-12-14 23:48:02 -05:00
Jeff Quast
c6cce57ff4
Avoid double-newlines in salt-call output
...
When using the salt provisioner with verbose=true, most lines read with an extra newline:
```
[INFO ] Syncing modules for environment 'base'
[INFO ] Loading cache from salt://_modules, for base)
```
because the line read has a newline, and emitting the log entry again includes an additional newline.
2014-12-03 21:48:30 -08:00
Ken Crowell
72afdce630
Issue #4895 : Support grains config for salt
2014-12-02 18:01:09 -04:00
Mitchell Hashimoto
d28a7806ea
Merge pull request #4472 from abele/fix/master/salt-retcode-passthrough
...
Fix state.highstate run when using salt master
2014-10-22 22:03:46 -07:00
Anton D
fdbf3366ce
Check whether Salt bootstrap script exists before attempting to delete it. GH-4614
2014-10-10 23:20:50 +13:00
Jānis Ābele
fe16352267
Fix state.highstate run when using salt master
...
retcode-passthrough option is available only for masterless salt-call.
2014-09-07 20:03:17 +03:00
Mitchell Hashimoto
1cc78dc224
provisioners/salt: use exit code to detect failure [GH-4304]
2014-08-06 11:07:09 -07:00
Mitchell Hashimoto
3bc5ecfbd0
provisioners/salt: whitespace
2014-08-06 11:05:03 -07:00
Marno van der Molen
1ddef49185
minor indentation fix
2014-05-19 14:10:58 +02:00
Marno van der Molen
7cb50f8a12
Remove Salt Master & Salt Syndic changes - not supported on Windows by Salt
2014-05-19 14:00:46 +02:00
Marno van der Molen
fbd919d52c
Retries starting the salt-minion service several times and adds elevated: true to salt calls
2014-05-19 13:14:25 +02:00
Marno van der Molen
02f40b35fa
Adds minimal implementation to deploy a Salt minion on Windows including support for pre-seeding the keys
2014-05-17 02:19:34 +02:00