Browse Source
Merge pull request #2062 from wanix/ansible-vagrant-update
replace ansible.sudo by ansible.become for vagrant
pull/2477/merge
Andreas Krüger
6 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with
3 additions and
9 deletions
-
Vagrantfile
-
docs/vagrant.md
|
|
@ -3,7 +3,7 @@ |
|
|
|
|
|
|
|
require 'fileutils' |
|
|
|
|
|
|
|
Vagrant.require_version ">= 1.9.0" |
|
|
|
Vagrant.require_version ">= 2.0.0" |
|
|
|
|
|
|
|
CONFIG = File.join(File.dirname(__FILE__), "vagrant/config.rb") |
|
|
|
|
|
|
@ -135,12 +135,6 @@ Vagrant.configure("2") do |config| |
|
|
|
|
|
|
|
config.vm.network :private_network, ip: ip |
|
|
|
|
|
|
|
# workaround for Vagrant 1.9.1 and centos vm |
|
|
|
# https://github.com/hashicorp/vagrant/issues/8096 |
|
|
|
if Vagrant::VERSION == "1.9.1" && $os == "centos" |
|
|
|
config.vm.provision "shell", inline: "service network restart", run: "always" |
|
|
|
end |
|
|
|
|
|
|
|
# Disable swap for each vm |
|
|
|
config.vm.provision "shell", inline: "swapoff -a" |
|
|
|
|
|
|
@ -164,7 +158,7 @@ Vagrant.configure("2") do |config| |
|
|
|
if File.exist?(File.join(File.dirname($inventory), "hosts")) |
|
|
|
ansible.inventory_path = $inventory |
|
|
|
end |
|
|
|
ansible.sudo = true |
|
|
|
ansible.become = true |
|
|
|
ansible.limit = "all" |
|
|
|
ansible.host_key_checking = false |
|
|
|
ansible.raw_arguments = ["--forks=#{$num_instances}", "--flush-cache"] |
|
|
|
|
|
@ -1,7 +1,7 @@ |
|
|
|
Vagrant Install |
|
|
|
================= |
|
|
|
|
|
|
|
Assuming you have Vagrant (1.9+) installed with virtualbox (it may work |
|
|
|
Assuming you have Vagrant (2.0+) installed with virtualbox (it may work |
|
|
|
with vmware, but is untested) you should be able to launch a 3 node |
|
|
|
Kubernetes cluster by simply running `$ vagrant up`.<br /> |
|
|
|
|
|
|
|