Skip to content

Commit aa67b12

Browse files
author
Stefan Walther
committed
chore: commit latest local state
1 parent ee1f57b commit aa67b12

File tree

3 files changed

+7
-4
lines changed

3 files changed

+7
-4
lines changed

local-vagrant-ansible/README.md

+2-1
Original file line numberDiff line numberDiff line change
@@ -39,4 +39,5 @@ Some articles which inspired this work.
3939
- [Vagrant Docker Swarm](http://jamesdmorgan.github.io/2016/docker-swarm/)
4040
- https://github.com/denverdino/docker-swarm-mode-vagrant/blob/master/Vagrantfile
4141
- https://github.com/mrlesmithjr/vagrant-ansible-docker-swarm
42-
- https://www.simonholywell.com/post/2016/02/intelligent-vagrant-and-ansible-files/
42+
- https://www.simonholywell.com/post/2016/02/intelligent-vagrant-and-ansible-files/
43+
- http://jamesdmorgan.github.io/2016/docker-swarm/#swarm-node-labels !!!

local-vagrant/README.md

+2
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,8 @@ $ vagrant --config-file=/configs/config.dev.yml up
7575
| `VBGUEST_NO_REMOTE` | Boolean | Prevent downloading VBGuest binaries from remote
7676
| `NETWORK_BRIDGED` | Boolean | Whether to add a bridged network.
7777
| `NETWORK_BRIDGED_DEFAULT` | String | Default network device for network bridge.
78+
| `` | |
79+
| `` | |
7880

7981
### Multi-Machine Options
8082

local-vagrant/Vagrantfile

+3-3
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ opts = GetoptLong.new(
3030
[ '--debug', GetoptLong::NO_ARGUMENT ],
3131

3232
# Custom options
33-
['--config-file', GetoptLong::OPTIONAL_ARGUMENT]
33+
[ '--config-file', GetoptLong::OPTIONAL_ARGUMENT ]
3434
)
3535

3636
configFile='./configs/config.yml'
@@ -246,8 +246,8 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
246246

247247
# Todo: Not really nice, but couldn't find any better way to provision one of the managers at "the end" of the process
248248
# Todo: This ugly hack is actually the main reason why this solution is not really nice and a combination of
249-
# - vagrant & bash
250-
# - vagrant & ansible
249+
# - vagrant & bash (see repo local-vagrant-bash)
250+
# - vagrant & ansible (see repo local-vagrant-ansible)
251251
# might be the better and more stable approach.
252252

253253
# Any hint welcome how to improve this ...

0 commit comments

Comments
 (0)