git.samba.org
/
obnox
/
vagrant
/
vagrant-samba-ad-dc.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
8031a2e
)
Bring container_name under a provider.lxc config hierarchy.
author
Michael Adam
<obnox@samba.org>
Wed, 18 Feb 2015 23:27:52 +0000
(
00:27
+0100)
committer
Michael Adam
<obnox@samba.org>
Wed, 18 Feb 2015 23:27:52 +0000
(
00:27
+0100)
Vagrantfile
patch
|
blob
|
history
diff --git
a/Vagrantfile
b/Vagrantfile
index ea2e7feb2a3cbab7db6e8b381e7955f2bb7e536e..6fe2e38d31256be5ac8e6a5861d6d780e700a137 100644
(file)
--- a/
Vagrantfile
+++ b/
Vagrantfile
@@
-27,7
+27,11
@@
vms = [
{
:hostname => 's4dc-180',
:box => 'local-trusty64',
- :container_name => 's4dc-180',
+ :provider => {
+ :lxc => {
+ :container_name => 's4dc-180',
+ },
+ },
:networks => [
{
:link => 'virbr1',
@@
-136,7
+140,7
@@
Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
node.vm.box = machine[:box]
node.vm.hostname = machine[:hostname]
node.vm.provider :lxc do |lxc|
- lxc.container_name = machine[:container_name]
+ lxc.container_name = machine[:
provider][:lxc][:
container_name]
machine[:networks].each do |net|
network_opts.each do |key|