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
Mitchell Hashimoto
5ea24e39d0
providers/virtualbox: unify import/clone
2015-10-08 13:07:05 -04:00
Mitchell Hashimoto
4908cd9cd9
providers/virtualbox: copy SSH key
2015-10-08 12:58:06 -04:00
Mitchell Hashimoto
e9922d1754
providers/virtualbox: discard state if cloning
2015-10-08 12:50:02 -04:00
Mitchell Hashimoto
dbcc936a71
kernel/v2: box is optional if clone is set
2015-10-08 12:41:16 -04:00
Mitchell Hashimoto
f0ddac8c9a
providers/virtualbox: clone
2015-10-08 12:33:55 -04:00
Mitchell Hashimoto
c5c3ba616b
providers/virtualbox: some progress
2015-10-08 12:09:46 -04:00
Mitchell Hashimoto
9f05d22eb0
providers/virtualbox: cloning can do a non-linked clone
2015-10-08 12:03:58 -04:00
Mitchell Hashimoto
20310dce0c
noop
2015-10-08 11:59:30 -04:00
Mitchell Hashimoto
06f8595bc0
kernel/v2: clone option
2015-10-08 11:59:09 -04:00
Mitchell Hashimoto
44d484e2e0
providers/virtualbox: ability to customize linked clone snapshot
2015-10-08 11:58:47 -04:00
Mitchell Hashimoto
ec0326f1c8
Merge pull request #6377 from mitchellh/f-cap-command
...
"cap" command
2015-10-08 10:52:14 -04:00
Mitchell Hashimoto
50638b2e55
commands/cap: require_relative
2015-10-08 10:42:10 -04:00
Mitchell Hashimoto
0a52e06298
commands/snapshot: use require relative
2015-10-08 10:40:46 -04:00
Mitchell Hashimoto
0b2d60ac39
commands/cap: better help
2015-10-08 10:36:44 -04:00
Mitchell Hashimoto
99d29f17fa
commands/cap
2015-10-08 10:35:36 -04:00
Mitchell Hashimoto
6e187aaefb
providers/virtualbox: v4.2 and 4.3 support
2015-10-08 08:57:21 -04:00
Mitchell Hashimoto
0abc17eaed
commands/snapshot: push now uses caps to be more resilient
2015-10-08 08:55:13 -04:00
Mitchell Hashimoto
7480b65e9d
providers/virtualbox: use caps for snapshot list
2015-10-08 08:46:36 -04:00
Mitchell Hashimoto
ed4df21c85
commands/snapshot: push and pop
2015-10-07 22:52:27 -04:00
Mitchell Hashimoto
c36b682e40
providers/virtualbox: fix error if no snapshots
2015-10-07 22:22:55 -04:00
Mitchell Hashimoto
8c0e38b397
providers/virtualbox: snapshot restore
2015-10-07 16:48:29 -04:00
Mitchell Hashimoto
c635352b89
providers/virtualbox: list snapshots, progress for delete
2015-10-07 16:41:58 -04:00
Mitchell Hashimoto
d0e8ecfc73
providers/virtualbox: snapshot save/delete
2015-10-07 16:16:53 -04:00
Mitchell Hashimoto
a99ebcb3ce
commands/snapshot
2015-10-07 15:52:37 -04:00
Mitchell Hashimoto
0586412f9d
providers/virtualbox: fix some crashing bugs
2015-10-06 16:22:48 -04:00
Mitchell Hashimoto
2c936b2e37
providers/virtualbox: tidying up the linked clone feature
2015-10-06 14:11:41 -04:00
Mitchell Hashimoto
d519d927fa
Merge branch 'VB-linked-clone-support' of https://github.com/mpoeter/vagrant into mpoeter-VB-linked-clone-support
2015-10-06 13:50:34 -04:00
Mitchell Hashimoto
2299715b41
providers/virtualbox: code review comments
2015-10-01 17:01:27 -04:00
Mitchell Hashimoto
05fbb4ced2
providers/virtualbox: more support
2015-10-01 08:50:47 -04:00
Mitchell Hashimoto
061a91d09b
providers/virtualbox: workaround IPv6 routing bug in VB
...
VirtualBox has a bug where the IPv6 route is lost on every other
configuration of a host-only network. This is also triggered when a VM
is booted.
To fix this, we test the route-ability of all IPv6 networks, and
reconfigure if necessary. This is very fast but we still only do this if
we have any IPv6 networks.
2015-09-30 18:19:37 -07:00
Mitchell Hashimoto
0d50f454ea
providers/virtualbox: VB5 support
2015-09-30 17:29:23 -07:00
Mitchell Hashimoto
ec0b0fb7f9
providers/virtualbox: IPv6 host only networks
2015-09-30 17:23:25 -07:00
Sam Phippen
53714abfa3
Handle encoding errors in shell provisioner newline normalization.
...
The problem demonstrated in #6065 is that a string has incorrectly been
encoded with US-ASCII even though it contains invalid US-ASCII byte
sequences (any byte with the most significant bit on is invalid in the
US-ASCII encoding).
The thing about doing newline normalization is that it is not actually
sensitive to the presence of US-ASCII byte sequenzes. Additionally, it
is very unlikely that a user will ever be using an encoding where \r\n
is not encoded the same as it would be in ASCII.
This patch first tries the existing method of normalizing the newlines
in the provided script file, if that fails for any reason it force
encodes the string to ASCII-8BIT (which allows the most significant bit
to be on in any individual byte) and then performs the substitution in
that byte space.
2015-09-12 14:36:54 +01:00
konomae
ad9a7324c5
Fix invalid ini entry error when ansible_ssh_private_key_file contains spaces
2015-08-29 18:00:20 +09:00
Manuel Pöter
2a2f0a4751
Use hash of machine name for lock file to avoid problems with invalid characters for file names.
2015-08-12 14:25:54 +02:00
Jason Woods
ff941ef4e8
Fix broken masterless minion configuration
2015-08-03 12:11:32 +01:00
지훈
287831dd2e
Fix for Issue #6006 - cfengine will now install
2015-07-20 02:08:13 -07: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
Manuel Pöter
772f276ee3
Port support for linked clones to VirtualBox 5.0 driver.
2015-07-16 13:27:24 +02:00
Mitchell Hashimoto
bac5d039db
providers/docker: pull setting, default false [GH-5932]
2015-07-15 11:08:01 -07:00
Mitchell Hashimoto
f26293bb06
hosts/linux: sudo to copy back to exports [GH-5957]
2015-07-15 11:04:05 -07:00
Mitchell Hashimoto
ce5a30b264
provisioners/puppet: fix config merging [GH-5958]
2015-07-15 10:59:34 -07:00
Mitchell Hashimoto
3476491881
update CHANGELOG
2015-07-15 10:57:38 -07:00
Mitchell Hashimoto
087ffa67b2
Merge pull request #5967 from benh57/fix_puppetwin_path
...
Fix custom puppet.binary_path to work properly on windows and fix puppet detection on windows.
2015-07-15 10:56:19 -07:00
Bob
f12f50c552
Raise Errno::ETIMEDOUT as "acceptable" Errors::ConnectionTimeout
2015-07-15 19:41:10 +02:00