haskal
/
vagrant
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
9,734 Commits 8 Branches 143 Tags 51 MiB
Commit Graph

94 Commits

Author SHA1 Message Date
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
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 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
Jurnell Cockhren fb611c7389 Revert "Initialize the install_command salt config var" 
Refers to issues #6276, #5973 and #5936

This reverts commit ccd7354665.
 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 27d7518636.
 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 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 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
Paul Krohn c7f32e6159 When you can't find the salt minion or master config, say what you were looking for. 2015-04-26 11:34:34 -07:00
Shawn Neal 9de3c481de Salt bootstrap ps1 should be idempotent 
- WinRM communicator error detection was tightened up thus exposing an issue in the salt bootstrap script creating directories that already exist.
 2015-04-14 05:57:16 -07:00
Jamezz 71c40bdf6a File architecture string should be x86 
As of 2014.7.0, Salt has changed their file naming for 32-bit from win32
to x86.
 2015-03-06 13:14:11 -08:00
Jamezz 2f4a0af5d1 Fix issue #4152: Salt minion bootstrapping 
Copy the config after we know the installer exits. Also rev the
installed version to 2014.7.1 (latest stable as of 3/4/2015)
 2015-03-04 18:08:07 -08: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