iSharkFly-Docs
/
packer-cn
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
16,494 Commits 40 Branches 99 Tags 102 MiB
Commit Graph

91 Commits

Author SHA1 Message Date
Nathan Hartwell d0d3229f96 Merge branch 'master' of https://github.com/mitchellh/packer 
Conflicts:
	provisioner/salt-masterless/provisioner.go
 2015-05-13 08:13:38 -05:00
Emil Hessman 3165b0c936 provisioner/salt-masterless: fix incorrect printf verb types 
Fixes the following vet reports:

provisioner/salt-masterless/provisioner.go:119: arg cmd for printf verb %s of wrong type: *github.com/mitchellh/packer/packer.RemoteCmd
provisioner/salt-masterless/provisioner.go:121: arg err for printf verb %d of wrong type: error
provisioner/salt-masterless/provisioner.go:142: arg err for printf verb %d of wrong type: error
provisioner/salt-masterless/provisioner.go:157: arg err for printf verb %d of wrong type: error
provisioner/salt-masterless/provisioner.go:172: arg err for printf verb %d of wrong type: error
provisioner/salt-masterless/provisioner.go:216: arg err for printf verb %d of wrong type: error
 2015-02-25 05:43:18 +01:00
Erik Simmler 034ed36d0e Ask salt to return a proper exit code so we can fail the builder appropriately. 2014-12-30 10:34:43 -05:00
Victor Trac eb72584415 fix passing bootstrap_args to bootstrap script 2014-12-22 14:08:32 -06:00
Nathan Hartwell e5c6f1a753 Merge branch 'master' of https://github.com/mitchellh/packer 
Conflicts:
	provisioner/salt-masterless/provisioner.go
 2014-11-05 10:58:25 -06:00
Mitchell Hashimoto 81d8cd0db4 Merge pull request #1394 from mafrosis/salt-masterless 
Salt masterless tidy up
 2014-10-28 08:35:10 -07:00
Steve Daniels 86fb46ab0a Update SaltStack provision to https 
This changes the SaltStack bootstrap URL to use the HTTPS link from the commercial site.  Alternatives are the HTTPS link to the raw file on GitHub, but this, whilst more transparent, might break down the line.
 2014-10-22 17:55:45 +01:00
Nathan Hartwell 331003c809 Merge branch 'master' of https://github.com/mitchellh/packer 2014-10-06 15:19:11 -05:00
mafro ed07fb63e4 salt provisioner: tidy up and refactor into functions 2014-10-01 12:31:58 +10:00
mafro e7a46d97c0 salt provisioner: require local_state_tree 2014-10-01 12:31:58 +10:00
Ross Smith II d92179847d provisioner/file: set file/directory permissions 
fixes #1064
 2014-05-09 21:03:35 -07:00
Nathan Hartwell 88ec874c32 Adding disable_sudo support to salt-masterless provisioner 
This is already present in some other provisioners and is helpful when
using a builder that gives you root access.
 2014-05-09 09:08:41 -05:00
Mitchell Hashimoto d1c497676a Merge pull request #514 from rgarcia/salt-masterless-uploaddir 
provisioner/salt-masterless: use communicator.UploadDir
 2013-10-20 17:42:38 -07:00
Rafael Garcia 32b9a305a1 provisioner/salt-masterless: use communicator.UploadDir 2013-10-09 18:51:30 -07:00
Rafael Garcia 76393ba285 provisioner/salt-masterless: move states to /srv/salt, not /srv/salt/states 
Latest version copies local state tree to {tmp}/states and then executes `mv {tmp}/states /srv/salt/`. This creates a `/srv/salt/states` instead of the correct `/srv/salt` directory.
 2013-10-09 13:49:30 -07:00
Mitchell Hashimoto 28bf6122bd provisioner/*: implement Cancel 2013-08-30 23:23:36 -07:00
Mitchell Hashimoto 404ae53a4a provisioner/salt-masterless: join paths properly 2013-08-30 14:26:29 -07:00
Mitchell Hashimoto b4b68bce00 Merge branch 'fix-minion-config-with-non-tmp-dir' of https://github.com/rach/packer into rach-fix-minion-config-with-non-tmp-dir 
Conflicts:
	provisioner/salt-masterless/provisioner.go
 2013-08-27 20:21:02 -07:00
Mitchell Hashimoto c9ef66651b fmt 2013-08-27 17:37:29 -07:00
Rachid Belaid a755be49fa Add doc and change pillar tree in roots to respect salt vocabulary 2013-08-28 01:01:37 +01:00
Rachid Belaid 7bdb5f9cfb Add setting for pillar folder to respect saltstack structure 2013-08-28 00:38:36 +01:00
Rachid Belaid 40af1e681a Fix minion config with non tmp dir 2013-08-27 23:49:04 +01:00
Mitchell Hashimoto 80e36f11b9 provisioner/salt-masterless: fix the build 2013-08-23 15:58:30 -07:00
Rachid Belaid 3cb3a7cd30 Fix #264 to upload local minion config 
Conflicts:
	provisioner/salt-masterless/provisioner.go
	website/source/docs/provisioners/salt.html.markdown
 2013-08-23 15:41:11 -07:00
Mitchell Hashimoto 64d87bfaf3 *: switch to packer ConfigTemplate 2013-08-15 19:17:23 -07:00
Mitchell Hashimoto 3ea4c720b1 provisioner/salt-masterless: switch replace to that prior replace works 
/cc @markpeek
 2013-08-12 17:10:50 -07:00
Mitchell Hashimoto d60b769217 provisioner/salt-masterless: replace windows slash with linux [GH-276] 2013-08-12 16:26:46 -07:00
Mitchell Hashimoto 769c349def provisioner/salt-masterless: nice error even if bad exit status 
/cc @rgarcia
 2013-08-12 09:19:11 -07:00
Mitchell Hashimoto ffa7dff585 fmt 2013-08-11 16:17:59 -07:00
Rach Belaid 23b856332e #269 Make local_state_tree option not mandatory 
Update and rename salt.html.markdown to salt-masterless.html.markdown
salt.html.markdown had a better history and formatting
And remove local_state_tree from required option from code and docs
 2013-08-10 16:18:57 +01:00
Mitchell Hashimoto adfb6caa2b provisioner/salt-masterless: error if any commands exit with non-zero 
[GH-266]

/cc @rgarcia
 2013-08-09 17:35:57 -07:00
Mitchell Hashimoto 72a7a5e69c provisioner/salt-masterless: don't delete states [GH-265] 2013-08-09 17:01:39 -07:00
Mitchell Hashimoto 55ad0058bc provisioner/salt-masterless: convert to new template stuff + user vars 2013-08-09 15:57:08 -07:00
Mitchell Hashimoto 5b7d8fbc74 rename builder/common to common since it is generally useful 2013-08-01 12:11:54 -07:00
Mitchell Hashimoto 25183e7702 provisioner/salt-masterless: remove Ui 
/cc @rgarcia Should just pass it in as a param
 2013-08-01 10:06:38 -07:00
Mitchell Hashimoto f7cbdf4112 provisioner/salt-masterless: verify local_state_tree exists 
/cc @rgarcia
 2013-07-31 23:11:08 -07:00
Mitchell Hashimoto 104fe91b48 provisioner/salt-masterless: use Messages for minor steps 
/cc @rgarcia - "Message" in Ui is the non-bold colored messages and
are meant for sub-messages or steps part of a larger message. "Say"
is used for the bold stuff. This is more in line wit how Packer works.
 2013-07-31 23:07:15 -07:00
Mitchell Hashimoto f3331afb1c provisioner/salt-masterless: don't capitalize Ui 
/cc @rgarcia - Not sure why this was capitalized to begin with
 2013-07-31 23:06:22 -07:00
Mitchell Hashimoto 7e5c64ca7f provisioner/salt-masterless: use common lib for config decoding 
/cc @rgarcia - Since you opened the pull request, common config
decoding stuff has been pulled out into the common Package. This
simplifies a lot of code.
 2013-07-31 23:05:15 -07:00
Mitchell Hashimoto aacca7d066 provisoner/salt-masterless: lowercase package name 
/cc @rgarcia - I don't know of any Go packages that follow this naming
convention so I just lowercased it.
 2013-07-31 23:01:03 -07:00
Rafael Garcia 29993b30e4 provisioner/salt-masterless: rename 2013-07-28 23:30:03 -07:00