Commit Graph

704 Commits

Author SHA1 Message Date
Megan Marsh f3a538db46 fix tests 2018-03-09 13:36:47 -08:00
Megan Marsh 3faf73b5f3 change backslashes to forward slashes in powershell provisioner; was breaking with cygwin 2018-03-09 09:29:29 -08:00
SwampDragons 7d9a86becb
Revert "Fix #5335" 2018-02-12 11:03:19 -08:00
DanHam 2d830d5d43
Auto escape chars special to PowerShell in user supplied data 2018-02-08 12:03:19 +00:00
DanHam aaf7102b9a
Tests for escape of chars special to PowerShell in user supplied data 2018-02-08 12:03:18 +00:00
DanHam a7b118ed94
Fix tests post changes. Add test for upload func. 2018-02-08 12:03:18 +00:00
DanHam 478589abec
Extend upload and subsequent 'dot sourcing' of env vars to std PS command
* Wrap funcs to flatten and upload env vars with new func prepareEnvVars.
  While the wrapped funcs could be combined, keeping them separate
  simplifies testing.
* Configure/refactor std and elevated PS to use new funcs to prepare,
  upload and dot source env vars.
* Dot sourcing the env vars in this way avoids the need to embed them
  directly in the command string. This avoids the need to escape the env
  vars to ensure the command string is correctly parsed.
* Characters within the env vars that are special to PS (such as $'s
  and backticks) will still need to be escaped to allow them to be
  correctly interpreted by PS.
* The std and elevated PS commands now inject env vars into the remote
  env via the same mechanism. This ensures consistent behaviour across the
  two command types.

Fixes #5471
2018-02-08 12:03:18 +00:00
Marc Mercer d3c7d43f20
Small typo correction 2018-02-07 19:47:01 -08:00
Marc Mercer 5d67f77f43
Fixing 5852 2018-02-07 19:41:01 -08:00
Megan Marsh 974d9974fe add workaround for azure bug. 2018-02-07 11:34:18 -08:00
Megan Marsh addedbb680 Revert "Merge pull request #5515 from DanHam/dot-source-env-vars"
revert so we can use a branch that's had more recent work done
This reverts commit e56849c605, reversing
changes made to 6d14eb6ea4.
2018-02-02 09:58:39 -08:00
Megan Marsh 79fe900378 Revert "Merge pull request #5376 from DanHam/ps-escapes"
Revert so that we can merge a different branch that's had more recent work instead
This reverts commit ba518637d4, reversing
changes made to e56849c605.
2018-02-02 09:57:36 -08:00
DanHam 7443adf2fd Simpler escape of chars special to PowerShell in user supplied data 2018-02-01 13:19:07 -08:00
DanHam 68e13c90b1 Revert "Escape chars special to PowerShell in user supplied data"
This reverts commit 53aefe744bcd74ee6ac866f764eafe9e7f507d80.
2018-02-01 13:19:07 -08:00
DanHam b67c64fd66 Tests for escape of chars special to PowerShell in user supplied data 2018-02-01 13:19:07 -08:00
DanHam f3c326bb3c Escape chars special to PowerShell in user supplied data 2018-02-01 13:11:05 -08:00
SwampDragons e56849c605
Merge pull request #5515 from DanHam/dot-source-env-vars
Extend upload and subsequent dot sourcing of env vars to non-elevated Powershell cmd
2018-02-01 13:06:01 -08:00
Matthew Hooker 9f87213ba4
tests and docs for #5831 2018-01-31 13:08:25 -08:00
Matthew Hooker 3127bfbcfb
Merge pull request #5831 from uShip/chef-client-policyfiles
Added Policyfile support to chef-client provisioner
2018-01-31 12:54:27 -08:00
Matthew Hooker aa76c47019
Merge pull request #5703 from frankdannhauer/5335
Fix #5335
2018-01-31 12:53:49 -08:00
Evan Machnic 5cedfc4557 Fixed go format errors 2018-01-31 11:06:31 -06:00
Evan Machnic 7354247933 Added policyGroup and policyName to Packer Communicator 2018-01-31 11:01:08 -06:00
Evan Machnic fe90f79704 Changed new code to use tabs instead of spaces 2018-01-31 10:54:40 -06:00
Evan Machnic 1f92aa2c0a Added Policyfile support to chef-client provisioner 2018-01-31 10:49:04 -06:00
Matthew Hooker 4bccbbba1f
Merge pull request #5790 from GennadySpb/trusted_certs_dir
Support 'trusted_certs_dir' chef-client configuration option
2018-01-23 13:11:27 -08:00
Matthew Hooker ebe995c0ff
run goimports 2018-01-22 17:21:10 -08:00
Gennady Lipenkov 53aaf84100 Support 'trusted_certs_dir' chef-client configuration option 2018-01-13 01:53:49 +03:00
Aidan Feldman b894c925d1
make user retrieval for Ansible provisioner more robust
Previously, the Ansible provisioner would look for the username from the
`USER` environment variable. Unfortunately, this is not always set -
particularly in Docker containers. It's very confusing to understand why
the error is happening.

Switched to using Go's built-in `os/user` package for retrieving the
current username. @rickard-von-essen had done this in 7369841, but
moved away from it in d59844f because, at the time, it wasn't possible
to use that library with cross-compilation. This was fixed in Go in

795e712b72
2018-01-03 02:52:41 -05:00
Hunter Morgan 6410fd615c
typo 2017-12-18 20:21:26 +00:00
frankdannhauer 893d0334f1
Fix #5335
https://github.com/hashicorp/packer/issues/5335
2017-12-14 14:00:52 +01:00
Dave Sanderson fc566a3cb4 Added test for new commands and guest os type 2017-12-13 11:16:21 -07:00
Dave Sanderson bf7a4b3363 remove erroraction on win removedir 2017-12-13 10:49:38 -07:00
Dave Sanderson 284b069003 Fixed stating of files on windows
added directory existence check to salt provisioner before directory clean up
2017-12-13 10:20:27 -07:00
Dave Sanderson 57770de36f revert file stat 2017-12-12 16:01:00 -07:00
Dave Sanderson a1ba4e5362 Silently continue on removeDir for Windows
Fixed parameter type exclusion in movePath command
2017-12-12 15:32:40 -07:00
Dave Sanderson 887b7dc476 Fix mixed case for mv 2017-12-12 15:24:34 -07:00
Dave Sanderson aee67d3933 Add ability to move files on remote system
Fix salt-masterless to use generic MovePath
2017-12-12 15:22:10 -07:00
Dave Sanderson 857e5d04d3 Fix command error for salt install 2017-12-12 15:11:29 -07:00
Dave Sanderson 666796e8eb Add ability to stat a remote path 2017-12-12 14:39:13 -07:00
Dave Sanderson 630b7466d6 updated test to remove old DefaultTmpDir reference
Fixed sudo logic
Fixed error message format issue for OSType check
2017-12-12 11:49:10 -07:00
Dave Sanderson 0efda50354 Initial Windows support 2017-12-12 11:36:38 -07:00
Megan Marsh 19c997cb0e revert to using UI becuase the remote command syntax breaks things on linux with vmware fusion. 2017-12-07 09:08:12 -08:00
SwampDragons 753d3cf216
Merge pull request #5618 from kwilczynski/ansible-local-clean-staging-directory
ansible-local: Add ability to clean staging directory.
2017-11-30 14:27:59 -08:00
Casey Robertson 8f02150178 Changes Linux install URL to omnitruck. Changes powershell install to use omnitruck rather than hard-coded 32-bit url 2017-11-28 14:23:12 -08:00
Krzysztof Wilczynski 10370adbab
ansible-local: Add ability to clean staging directory.
Signed-off-by: Krzysztof Wilczynski <kw@linux.com>
2017-11-21 21:09:01 +01:00
SwampDragons ce1f2457fd
Merge pull request #5563 from hashicorp/fix_5483
make restart command work correctly even if user has their own check …
2017-11-09 16:16:47 -08:00
Megan Marsh c3cb7fe9f9 read from stderr so it doesnt lock up 2017-11-09 15:52:49 -08:00
Megan Marsh 9b1ae530c3 have separate stdout and stderr buffers 2017-11-09 15:35:28 -08:00
Matthew Hooker e073d63f30
remove racy reuse of single buffer for remotecmd stderr/out. 2017-11-09 15:22:47 -08:00
Megan Marsh 6019e41544 dont read stderr 2017-11-09 15:18:43 -08:00
Megan Marsh 73b6247fd2 remove unnecessary boolean operator 2017-11-09 15:04:25 -08:00
Megan Marsh e56a6dc9a0 add some comments 2017-11-09 14:55:12 -08:00
Megan Marsh a739623d9b don't pipe restarted stuff through the ui 2017-11-09 14:44:26 -08:00
Megan Marsh d71bc34dfc don't need this in a loop 2017-11-09 11:49:12 -08:00
Megan Marsh d81871171c make restart command work correctly even if user has their own check command 2017-11-07 15:01:02 -08:00
DanHam 4b89fc1c00
Fix tests post changes. Add test for upload func. 2017-10-30 21:08:14 +00:00
DanHam 5949bc91c4
Extend upload and subsequent 'dot sourcing' of env vars to std PS command
* Wrap funcs to flatten and upload env vars with new func prepareEnvVars.
  While the wrapped funcs could be combined, keeping them separate
  simplifies testing.
* Configure/refactor std and elevated PS to use new funcs to prepare,
  upload and dot source env vars.
* Dot sourcing the env vars in this way avoids the need to embed them
  directly in the command string. This avoids the need to escape the env
  vars to ensure the command string is correctly parsed.
* Characters within the env vars that are special to PS (such as $'s
  and backticks) will still need to be escaped to allow them to be
  correctly interpreted by PS.
* The std and elevated PS commands now inject env vars into the remote
  env via the same mechanism. This ensures consistent behaviour across the
  two command types.

Fixes #5471
2017-10-30 21:08:13 +00:00
Matthew Hooker ecad3348b3
rephrase log message. 2017-10-26 10:41:49 -07:00
Ohad Basan 33b85b0130 Add suggestion for "expected_disconnect" option if disconnection occurs 2017-10-26 19:53:48 +03:00
Matthew Hooker 75111e49e9
remove convoluted pointer logic 2017-10-11 23:35:24 -07:00
Matthew Hooker bafcf7dfb1
test, document, cleanup puppet guest codde 2017-10-03 11:39:33 -07:00
Matthew Hooker 7523cc76de Merge pull request #5340 from c22/issue_5339
Fix regression bug reported in #5339
2017-10-03 10:44:41 -07:00
Matthew Hooker d26e28a028 Merge pull request #5341 from c22/issue_5338
Fix facterVar separator bug reported in #5338
2017-09-29 09:49:22 -07:00
DanHam fa5fd602aa Fix tests post changes 2017-09-26 11:07:26 +01:00
DanHam 8214a12a2a Move append of portion of command used to send elevated PS output to file 2017-09-26 11:07:26 +01:00
DanHam 2a060adbf8 Don't use -EncodedCommand with PS as progress stream always leaks to stderr
* Setting $ProgressPreference to SilentlyContinue makes no difference
  when -EncodedCommand is used - any output to the progress stream
  still appears on stderr.
* Delete file containing encode/decode functions since we no longer
  need them.
* Fixes leak of output on progress streams for both normal and elevated
  commands.
* Since we no longer base64 encode, ensure any characters special to XML
  are correctly escaped in the elevated command. This ensures correct
  parsing once the command is wrapped within the elevatedTemplates XML
  based Task Scheduler definition.

Fixes #4322
2017-09-26 11:07:11 +01:00
Matthew Hooker 2297cfaee2 Merge pull request #5357 from lochnesh/fix-windows-chef-solo-version
use flag -version instead of -v to install chef-solo on Windows
2017-09-25 18:18:16 -05:00
DanHam 5374c6e367
Use system context env var to set path for elevated PS env vars file 2017-09-21 12:08:29 +01:00
Skyler Nesheim 52d3137b08 use flag -version instead of -v to install chef-solo on Windows 2017-09-18 09:43:02 -05:00
Matthew Hooker 70e493a2c2
fix directory permissions when using sudo 2017-09-15 10:48:50 -07:00
Matthew Hooker af1187d5e1
simplify a bit 2017-09-15 10:06:54 -07:00
Megan Marsh b05c673a14 Update powershell provisioner test with new default 2017-09-15 08:17:17 -07:00
Megan Marsh cbe1d7d854 simplify file upload for elevated powershell wrapper 2017-09-14 17:01:48 -07:00
Megan Marsh 92e70757bb Move env vars into a file that we dot-source instead of trying to write them all to the command line 2017-09-14 17:00:57 -07:00
Megan Marsh d458628529 exclude elevated_executed_command from config interpolation so it can be used correctly later 2017-09-14 10:50:32 -07:00
c22 948f955758 Fix regression bug reported in #5339 2017-09-14 11:44:14 +10:00
c22 cb12cd6668 Fix facterVar separator bug reported in #5338 2017-09-14 11:35:54 +10:00
Megan Marsh c6889ad009 clarify logging by changing 'shell' to 'powershell' inside of the powershell provisioner 2017-09-06 11:59:25 -07:00
Megan Marsh 959db1ac16 add echo test to winrm connection. 2017-09-01 15:26:41 -07:00
Matthew Hooker 54920422ea Merge pull request #5252 from c22/packer_4391_rework
#4391 rework (see #4426)
2017-08-31 13:46:48 -07:00
Megan Marsh f15304aa59 Merge pull request #5272 from hashicorp/fix_5064
Fix post-restart powershell failure
2017-08-28 11:41:37 -07:00
Megan Marsh 401c718a59 set default for ExpectDisconnect to false 2017-08-24 14:46:52 -07:00
Megan Marsh b1001264ed fix windows-restart tests 2017-08-24 14:30:15 -07:00
Megan Marsh b2923b4da6 check stdout to make sure echo command actually goes through before counting computer as fully restarted 2017-08-24 12:10:27 -07:00
Megan Marsh 89b058604d update tests for pull 5272 2017-08-22 14:20:40 -07:00
Megan Marsh 5214851463 make every script name unique 2017-08-22 14:03:28 -07:00
c22 42f1aa7a95 Refactor puppet-masterless based on puppet-server 2017-08-22 14:10:37 +10:00
c22 bc2e3de06d Resolve merge conflicts and update documentation. 2017-08-22 14:10:37 +10:00
c22 80ba99c04f Update documentation + small fixes
Updated the puppet-masterless documentation
Removed extraneous ConfigTemplate code
2017-08-22 14:10:37 +10:00
c22 fbac46af91 Linting + formatting 2017-08-22 14:10:37 +10:00
Sam Kerr bcd30ad2f2 Update puppet-masterless commands to be OS specific
Previous implementation hardcoded "mkdir -p" which is fine for Unix, but
fails on Windows. This change draws on the example in the chef-solo
provisioner on how to detect the OS in use and use an appropriate mkdir
command.

In addition to updating the mkdir command, the actual executeCommand
needs to be OS specific, since Windows doesn't have sudo and Unix
doesn't require 'SET' when trying to change the value of a variable.

Modify the actual Windows command used to run Puppet.

Since the Facter vars on Windows are set with 'SET <varname>=<value>', a
'&&' is needed between the SET commands and the actual Puppet
invocation.
2017-08-22 14:10:37 +10:00
c22 1c592f291e Better Windows support in puppet-server
Reworking the puppet-server provisioner based on chef-client.
2017-08-22 14:10:37 +10:00
Brett Russ 7192c46e46 sudo prefix the command which cleans up `/srv/{salt,pillar}` as these are created with sudo in the packer driven salt bootstrapper 2017-08-11 21:26:16 -04:00
Luke Farnell d9a5b69403 clean up ineffectual assignments 2017-08-07 13:20:01 -04:00
localghost daca0c2efe Remove accidental dependency to moby's ioutils package. 2017-07-10 22:05:42 +02:00
localghost 079cbc263f Add tests for playbook_files with playbook_dir. 2017-07-10 21:58:46 +02:00
Zbigniew Kostrzewa 33ae9cb2bb Add test for playbook_files using docker builder. 2017-07-10 08:19:29 +02:00
localghost 9ea6313b68 Fix playbook_files test on Windows. 2017-07-06 21:28:27 +02:00
localghost f682045345 Test for ansible-local playbook_files with mocked Communicator. 2017-07-06 06:44:03 +02:00
Zbigniew Kostrzewa 41d0adfbdd Add playbook_files to execute multiple ansible playbooks. 2017-07-01 23:21:07 +02:00
Matthew Hooker b1f06bbebb
fix wording 2017-06-26 12:56:55 -07:00
Matthew Hooker 56979a1974
Revert "Universally provide POSIX semantics for the `shell` provisioner."
This reverts commit 1ba7f9cc20.
2017-06-21 16:11:47 -07:00
Matthew Hooker 67e29e1eff
disambiguates windows-restart messages. 2017-06-21 10:51:23 -07:00
Matthew Hooker 11379dea70 Merge pull request #5009 from sjlamerton/salt_bin_dir
Add support for salt_bin_dir
2017-06-13 10:21:53 -07:00
Matthew Hooker 8f685b3bcd
ansible: add skip_version_check flag 2017-06-07 13:31:56 -07:00
Matthew Hooker 70b3d05fb3 Merge pull request #4760 from fajpunk/ansible-inventory-dir
inventory_directory option for ansible provisioner
2017-06-07 11:22:23 -07:00
Steven Lamerton e953898890 Add support for salt_bin_dir
Allows specifying the path to salt-call, useful if it isn't on the
path.
2017-06-07 08:16:23 +01:00
Matthew Hooker bc16c13b50 Merge pull request #4961 from magicalbob/grains
Grains
2017-06-06 12:37:18 -07:00
Matthew Hooker 74bf0b636b Merge pull request #4791 from optix2000/master
Add version selection for chef-solo provisioner
2017-06-05 15:30:48 -07:00
Ian Ellis 31f66b6fe9 Cloned GrainsFile test from MinionConfig test 2017-06-04 13:03:50 +01:00
Ian Ellis 912fc9c2af Added grains_file config item to copy file to /etc/salt/grains 2017-06-04 08:31:30 +01:00
Sean Chittenden 1ba7f9cc20
Universally provide POSIX semantics for the `shell` provisioner.
All platforms everywhere have `env(1)` available, leverage it
accordingly.

Improves on: #2343
2017-05-20 09:28:02 -07:00
Matthew Hooker 7999f886b1 Merge pull request #4792 from mkuzmin/slash
provisioner/ansible-local: Convert Windows paths with backslashes to …
2017-04-26 15:20:49 -07:00
Dan Fuchs 8401057ed5 Merge branch 'master' into ansible-inventory-dir 2017-04-26 13:20:00 -05:00
Rickard von Essen 999f2da499
ansible-local/ansible: Add extra-vars packer_*
Added:
- `packer_build_name`
- `packer_builder_type`
- `packer_http_addr` - `ansible-local` only

Closes: #4820
2017-04-23 12:55:01 +02:00
Dan Fuchs 97c819dc15 Merge branch 'master' of https://github.com/mitchellh/packer into ansible-inventory-dir 2017-04-20 10:34:03 -05:00
Weilu Jia b1c5ccd3e2 Add version selection for chef-solo provisioner in Windows too 2017-04-17 18:16:34 -07:00
Michael Kuzmin 795921988e provisioner/ansible-local: Convert Windows paths with backslashes to Unix style 2017-04-13 12:15:00 +03:00
Weilu Jia c418307162 Add version selection for chef-solo provisioner
Prevents issues such as #1751 when chef changes major versions
2017-04-12 16:18:00 -07:00
Dan Fuchs f45f4568db make validateInventoryDirectoryConfig function 2017-04-06 14:50:02 -05:00
Dan Fuchs 39a9eac44f Remove `req` param from validateDirectoryConfig 2017-04-05 09:14:30 -05:00
Dan Fuchs 3fc809c05b Ansible provisioner: check if inventory directory exists during prepare 2017-04-04 22:49:24 -05:00
Dan Fuchs 492bff474b Ansible provisioner: Specify full path to generated inventory file 2017-04-04 22:04:26 -05:00
Dan Fuchs 609e70face inventory_directory option for ansible provisioner
Add an `inventory_directory` setting to the Ansible provisioner that
allows a user to specify a directory in which the Packer Ansible
provisioner would write the generated inventory file.  If a value is
specified for this setting, then have the Packer Ansible provisioner
pass this directory as the -i arg when it calls ansible.

This would allow an Ansible playbook used by the Packer Ansible
provisioner to use variables specified in `host_vars` and `group_vars`
in this inventory directory.
2017-04-04 16:43:46 -05:00
Matthew Hooker 81522dced0
move packer to hashicorp 2017-04-04 13:39:01 -07:00
Matthew Hooker 6f27f67346
more fixes from errcheck 2017-03-29 13:38:31 -07:00
Matthew Hooker de296ac06b
simplify 2017-03-28 20:45:25 -07:00
Matthew Hooker 35578d9ed1
remove unnecessary type conversions 2017-03-28 20:36:21 -07:00
Matthew Hooker 79287d7e47
simplify some code 2017-03-28 20:36:20 -07:00
Matthew Hooker 0149f679de
Print instead of Printf with no dynamic first variable. 2017-03-28 20:36:20 -07:00
Matthew Hooker d1b20b3d9c
remove a bunch of dead code.
https://github.com/dominikh/go-tools/tree/master/cmd/unused
2017-03-28 20:36:20 -07:00
Matthew Hooker 230079f73a
spell fixes 2017-03-28 20:36:19 -07:00
Andrey Chernih 7548024720 More verbose error message when ansible-playbook fails
I've spent 1 hour today debugging why packer does not want to work with
ansible. It turns out `ansible-playbook` command was returning non-zero
exit status because of the file system permission problem.

Output before change:

    % packer build rabbitmq.json
    amazon-ebs output will be in this color.

    1 error(s) occurred:

    * exit status 1

Output after change:

    amazon-ebs output will be in this color.

    1 error(s) occurred:

    * Error running "ansible-playbook --version": exit status 1
2017-03-21 20:26:41 -07:00
Matthew Hooker 6894f93085 Merge pull request #4534 from mitchellh/chefclean
provisioner/chef-client: only upload knife config if we're cleaning
2017-02-26 18:46:15 -08:00
Marc Carmier 78ab21b42f Test error messages for restart_command and restart_timeout seems to be erroneous 2017-02-12 18:17:31 +01:00
Matthew Hooker 825f69c64d
provisioner/chef-client: only upload knife config if we're cleaning 2017-02-09 23:37:35 -08:00
Matthew Hooker a836268490
fix test on windows 2017-02-06 11:29:39 -08:00
Matthew Hooker 0f445dff07
fix tests 2017-02-03 15:03:19 -08:00
Matthew Hooker 45030e1919
provisioner/anisble: use randomized staging dir 2017-01-27 16:14:35 -08:00
DanHam 370b67497e
provisioner/powershell: Don't over complicate removal of tmp output file 2017-01-26 11:21:45 +00:00
DanHam 21be983855 provisioner/powershell: Use system context env var to set output file path
Fixes #4271
2017-01-26 00:17:46 +00:00
DanHam e350739ecb
post-processor/shell-local: expand tests to align with shell provisioner 2017-01-23 22:25:39 +00:00
DanHam 28051a9218 provisioner/windows-shell: fix and compact env var test 2017-01-23 12:10:46 +00:00
DanHam e8db6b9b9a provisioner/windows-shell: Remove env var check - again checked in prepare 2017-01-23 12:10:46 +00:00
DanHam c88fafdf38 provisioner/powershell: align, fix and compact env var test 2017-01-23 12:10:46 +00:00
DanHam 4122f3a897 provisioner/powershell: Remove env var check - we already check in Prepare 2017-01-23 12:10:46 +00:00
DanHam 4514b1b10f provisioner/shell: expand tests to align with powershell/win-shell 2017-01-23 12:10:46 +00:00
DanHam 0cbb4ff30c provisioner/shell: Align gen of flattened env vars with powershell/win-shell
* Move code to generate quoted flattened env vars to separate function
* Fix: generate flattened env vars once per provisioner not once per script
2017-01-23 12:10:46 +00:00
DanHam 80ebcea5e1
Mirror cleaner test code back from windows-shell to powershell 2017-01-19 13:33:59 +00:00
DanHam 2bd9fa6c70
Use counter for index. Sort stray comments. 2017-01-19 12:12:00 +00:00