diff --git a/website/docs/source/v2/multi-machine/index.html.md b/website/docs/source/v2/multi-machine/index.html.md index 799df3397..66f570f40 100644 --- a/website/docs/source/v2/multi-machine/index.html.md +++ b/website/docs/source/v2/multi-machine/index.html.md @@ -99,9 +99,9 @@ web and DB machine. You could also optionally be specific and say Additionally, you can specify a regular expression for matching only certain machines. This is useful in some cases where you specify many similar machines, for example if you're testing a distributed service you may have -a `master` machine as well as a `slave0`, `slave1`, `slave2`, etc. If you -want to bring up all the slaves but not the master, you can just do -`vagrant up /slave[0-9]/`. If Vagrant sees a machine name within forward +a `leader` machine as well as a `follower0`, `follower1`, `follower2`, etc. If you +want to bring up all the followers but not the leader, you can just do +`vagrant up /follower[0-9]/`. If Vagrant sees a machine name within forward slashes, it assumes you're using a regular expression. ## Communication Between Machines @@ -135,10 +135,10 @@ Vagrant to _not_ start specific machines. Example: ```ruby config.vm.define "web" config.vm.define "db" -config.vm.define "db_slave", autostart: false +config.vm.define "db_follower", autostart: false ``` When running `vagrant up` with the settings above, Vagrant will automatically -start the "web" and "db" machines, but will not start the "db\_slave" machine. -You can manually force the "db\_slave" machine to start by running -`vagrant up db_slave`. +start the "web" and "db" machines, but will not start the "db\_follower" machine. +You can manually force the "db\_follower" machine to start by running +`vagrant up db_follower`. diff --git a/website/docs/source/v2/vagrantfile/tips.html.md b/website/docs/source/v2/vagrantfile/tips.html.md index 4e65870ef..c195e5084 100644 --- a/website/docs/source/v2/vagrantfile/tips.html.md +++ b/website/docs/source/v2/vagrantfile/tips.html.md @@ -19,9 +19,9 @@ you wanted to create three machines:
(1..3).each do |i| - config.vm.define "slave-#{i}" do |slave| - slave.vm.provision "shell", - inline: "echo hello from slave #{i}" + config.vm.define "node-#{i}" do |node| + node.vm.provision "shell", + inline: "echo hello from node #{i}" end end@@ -34,16 +34,16 @@ the value of a variable used within the configs. For example, the loop below
# THIS DOES NOT WORK! for i in 1..3 do - config.vm.define "slave-#{i}" do |slave| - slave.vm.provision "shell", - inline: "echo hello from slave #{i}" + config.vm.define "node-#{i}" do |node| + node.vm.provision "shell", + inline: "echo hello from node #{i}" end endThe "for i in ..." construct in Ruby actually modifies the value of `i` for each iteration, rather than making a copy. Therefore, when you run this, -every slave will actually provision with the same text. +every node will actually provision with the same text. This is an easy mistake to make, and Vagrant can't really protect against it, so the best we can do is mention it here.