12 Commits

Author	SHA1	Message	Date
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