c6ee1049aa
Darwin: put each NFS export on its own line ( #11216 )
...
This commit introduces a Darwin-specific template for NFS exports. This is almost identical to the standard BSD template except it puts each NFS export on its own line.
This resolves NFS issues discovered in macOS Catalina.
2019-11-25 15:41:05 -05:00
f8449063b6
Have default names for primary and non-primary disks
2019-11-22 14:40:23 -08:00
b56dede627
Do not set primary option if it's not UNSET or false
2019-11-22 14:40:23 -08:00
f55aca091c
Wrap disk feature in experimental flag
2019-11-22 14:40:23 -08:00
86f9243762
Move validation message to locales
2019-11-22 14:40:23 -08:00
734aad1ede
Enforce unique names for disk config objects
2019-11-22 14:40:23 -08:00
b5b59a4eee
Base name for disk is vagrant_primary if primary
2019-11-22 14:40:23 -08:00
ea7a230cb6
Move disk config validation messages to locales file
2019-11-22 14:40:23 -08:00
57fd731fbf
Add warning if machines provider was not found in disk provider config
...
opts
2019-11-22 14:40:23 -08:00
3a2b4ddef2
Validate that disk file exists in disk config validate
2019-11-22 14:40:23 -08:00
2e324a4971
Add conversion method for shortcut size in disk config
2019-11-22 14:40:23 -08:00
271cf8a603
Begin to add Numeric class helper for converting size strings
2019-11-22 14:40:23 -08:00
7feee7a87f
Add locale for primary disk validation error
2019-11-22 14:40:23 -08:00
a457dee8b0
Set default disk to non-primary
2019-11-22 14:40:23 -08:00
a51e9b1fa1
Support both kinds of provider config options for disk config
2019-11-22 14:40:23 -08:00
83fea21ff1
Simplify builtin disk action
2019-11-22 14:40:23 -08:00
e598007237
Add provider specific disk options under provider_config hash
2019-11-22 14:40:23 -08:00
6c54bf6ad9
Fix logger namespace typo
2019-11-22 14:40:23 -08:00
d54e870752
Add file option to disk config
2019-11-22 14:40:23 -08:00
71ad0f7aba
Remove duplicate setting of disks variable
2019-11-22 14:40:23 -08:00
35f113e759
Put back accidental case switching for comments on provisioner
2019-11-22 14:40:23 -08:00
9c1d05113f
Update merge comment for disk config
2019-11-22 14:40:23 -08:00
93828508ec
Update config/vm with tests for disk config
2019-11-22 14:40:23 -08:00
499e39dd10
Ensure primary is true or false
2019-11-22 14:40:23 -08:00
cef1bd47b3
Add initial disk builtin action
2019-11-22 14:40:23 -08:00
a55e3d2b91
Make config.vm.disks accessible instead of internal
2019-11-22 14:40:23 -08:00
c18f36e516
Fix code comment typo
2019-11-22 14:40:23 -08:00
ad73969010
Fixup disk config parsing to allow hash and block
2019-11-22 14:40:23 -08:00
7cfccb5cfd
Update variable docs for disk name
2019-11-22 14:40:23 -08:00
ee751ca6e1
Add disk name for disk config
2019-11-22 14:40:23 -08:00
995c4bbc60
Add validation for disk configs
2019-11-22 14:40:23 -08:00
a18ce4f732
Add primary config option for disk
2019-11-22 14:40:23 -08:00
393ce9eb1b
Rename drives to disks to match class, and properly merge configs
2019-11-22 14:40:23 -08:00
28d339eac5
Ensure block is properly passed through to add_config
2019-11-22 14:40:23 -08:00
ee388d8293
Ensure config is renamed to options
2019-11-22 14:40:23 -08:00
34673fe5f9
Add disk class function for provider layers
2019-11-22 14:40:23 -08:00
98a2d0f723
Update internal drives state to be array instead of hash
2019-11-22 14:40:23 -08:00
abcc334900
Add note about disk options value
2019-11-22 14:40:23 -08:00
1a21782bd5
Add note about disk name
2019-11-22 14:40:23 -08:00
e361900d3a
Update doc string for name attribute
2019-11-22 14:40:23 -08:00
aa5a3ef7f7
Add initial disk management config class
2019-11-22 14:40:23 -08:00
e100d9cd48
Merge pull request #11205 from briancain/DOCKER-BUILDKIT-FIXUP
...
Enhance docker build method for the Docker provider to include buildkit output
2019-11-22 14:21:59 -08:00
2901dae948
Add option for docker executor to handle stderr from results
...
Instead of always joining stdout and stderr, only join the two if the
caller explicitly asks for it. Otherwise, only return stdout.
2019-11-22 12:04:09 -08:00
fb7a9d5582
Remove trailing whitespace
2019-11-21 13:44:28 -08:00
3519f82b24
guest/redhat: fix nfs client installation
...
CentOS 8+ and Fedora 30+ no longer have the alias "nfs" for "nfs-server"
systemd service.
This shouldn't break backward compatibility, since "nfs-server" service
is available on all supported redhat systems that have systemctl binary.
Fixes #10838
2019-11-21 13:11:29 -08:00
4d70856b8a
Enhance docker build matching for determining built container ID
...
Prior to this commit, docker would look for a container ID based on
"Successfully built" string. This output does not exist if a user has
enabled the experimental feature buildkit. This commit updates the build
behavior to match against both kinds of outputs, and instead of using
`scan`, it uses MatchData and groups the container id with match group
name `:id` instead of making hard assumptions with the matches being
contained inside arrays from scan.
2019-11-19 10:59:28 -08:00
4fc8b07974
Removed the word 'done'.
...
There are cases, when 'done' is prefix with a duration, like `... 0.1s done`.
2019-11-19 10:02:03 -08:00
f3629ebd09
Buildkit-based output processed a bit differently.
2019-11-19 10:02:03 -08:00
8041d0ae78
Build quietly and capture the image hash
...
At least on macOS combo Catalina + Docker engine 19.03.4 + Docker desktop 2.1.0.4 + vagrant 2.2.6 the original `matches = result.scan(/Successfully built (.+)$/i)` -line fails to generate a match. With this change I can `vagrant up --provider=docker` successfully.
2019-11-19 10:02:03 -08:00
4fd2373753
nfs: avoid adding extra newlines to /etc/exports
...
StringBlockEditor already adds the necessary newlines. That extra
newline was making /etc/exports longer and longer, full of empty lines,
because StringBlockEditor doesn't know about it and does not remove it.
2019-11-17 00:33:08 -03:00
Jeff Bonhag
Brian Cain
Tomas Krizek
Juha Ruotsalainen
Rumpu-Jussi
Antonio Terceiro