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

32 Commits

Author SHA1 Message Date
David Cournapeau 74d22069d4 BUG: naive attempt at fixing #2970. 2015-05-30 11:39:23 -07: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
deyk 567af495d4 Add colorization and log_level support to salt provisioner. 
This commit adds two new options to the salt provisioner:

- `colorize`: controls color output. Defaults to no-color (present behavior).
- `log_level`: controls log level. Defaults to `debug` (present behavior).

Docs included!
 2014-05-01 11:10:09 -07:00
Timothy Messier 513a9bf1ab Set u+w perms on private keys in tmp dir. 
This should allow additional `vagrant provision` calls to work when
using the salt provisioner and providing private keys. See #3542.
 2014-04-29 11:13:12 -04:00
Timothy Messier adeaf29487 Fixed missing end to if 2014-04-27 12:36:01 -04:00
Timothy Messier b93c6df956 The various `install` args should always be passed to salt-bootstrap. 
Even when preforming config only, the install flags (i.e. -M, -S, -N),
are used by the bootstrap to determine which configs to copy.

This should help with #3542 and should supersede #3548.
 2014-04-27 12:34:24 -04:00
Timothy Messier c4ae0badc3 Force overwrite of salt configs and keys. 
This will tell the salt-bootstrap script to overwrite the master/minion
configs and/or keys each time provision is called. #3524 #3176
 2014-04-24 11:56:54 -04:00
Mitchell Hashimoto 72030d2180 Note provisioners that don't work on Windows guests 2014-04-21 13:54:02 -07:00
Mitchell Hashimoto b0f8d050f0 provisioners/salt: style nitpicks 2014-03-12 20:04:57 -07:00
A.J. Welch 9f0efc19a9 Fix "options are only allowed before install arguments" error. 
This reverts feb748f488 and 7cd7077467. `bootstrap_options` is
meant for flag options such as `-D`. This is demonstrated in the
example Vagrantfile from the original plugin:
github.com/saltstack/salty-vagrant/blob/develop/example/complete/Vagrantfile
Flag options must be appended to the options string before install
args such as `install_type` and `install_args`.
 2014-02-19 20:24:05 -08:00
Thomas Grainger feb748f488 Allow defining of <install-type> and <install-type-args> 2014-01-06 12:22:43 +00:00
Nicolas Delaby 7cd7077467 salt-bootstrap.sh: options are only allowed before install arguments 2013-11-29 15:52:12 +01:00
viq fee0f8d8ab Fix seed_master key file name 
As per https://github.com/saltstack/salty-vagrant/pull/98 and https://github.com/saltstack/salty-vagrant/issues/97 the expected file name for minion is 'minion', not 'seed-minion.pub'
 2013-10-10 13:04:31 +02:00
Jeff Singer 852812f778 Adding overstate support to the salt provisioner 2013-10-03 15:28:35 -04:00
Ian Heggie 4f11716633 Remove old /tmp/bootstrap_salt.sh before uploading as it may not be writeable 2013-09-29 21:05:59 +10:00
Jurnell Cockhren 624a9dd2fd need_configure should return true when master_config is defined as well. 
This fixes #2204 and fixes saltstack/salty-vagrant#100
 2013-09-14 09:49:37 -05:00
Mitchell Hashimoto e5db091b1c provisioners/salt: default bootstrap script gets latest 2013-08-29 17:40:59 -07:00
Mitchell Hashimoto 874994ff73 provisioners/salt: remove unused code 2013-08-29 17:26:52 -07:00
Ray Elsleiman 836eadf7b0 Updating provisioner to use latest bootstrap script 2013-06-20 08:51:44 +10:00
Raadad Elsleiman e108995023 added most recent version of salty-vagrant and bootstrap.sh 2013-05-19 03:29:36 +10:00
Raadad Elsleiman 25ef83e1e4 pushing salt provisioner 2013-04-18 22:41:34 +10:00