Defining multiple VMs

diff --git a/.gitignore b/.gitignore
index 9ae26c00eb98a6437c515cc06aa7fc6aad8453d8..ce9693b59b64b0e6834ff31daa006566c935205b 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 modules/*
+.vagrant

diff --git a/README.md b/README.md
index bbd48d9f480bb3d46897efbdea274653ee5bae00..a05301a3a1bcbcd1e9206a006c260d9c23b3d464 100644 (file)
--- a/README.md
+++ b/README.md
@@ -25,4 +25,4 @@ This will be a `Vagrant` example:
     git clone git://git.sarava.org/puppet-bootstrap.git puppet # use submodule or subtree as you please
     ln -s puppet/Vagrantfile .                                 # or copy if you want to customize
     ( cd puppet && mr up )                                     # need the mr binary to download the submodules
-    vagrant up
+    vagrant up web                                             # with no arguments, all defined VMs are started

diff --git a/Vagrantfile b/Vagrantfile
index 6c74ddbd67fd378b5e47aba2ef71a5f8b3553e0c..29e737840f2d2c4e4c3162675531eaefe4e6937a 100644 (file)
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -16,6 +16,33 @@ Vagrant::Config.run do |config|
     puppet.pp_path        = "/etc/puppet"
   end
 
+  # Define a Host VM
+  config.vm.define :host do |host_config|
+    db_config.vm.box = "host"
+    web_config.vm.network :hostonly, "192.168.50.101"
+  end
+
+  # Define a Puppetmaster VM
+  config.vm.define :master do |master_config|
+    master_config.vm.box = "master"
+    master_config.vm.forward_port 8139, 8140
+    web_config.vm.network :hostonly, "192.168.50.102"
+  end
+
+  # Define a Proxy VM
+  config.vm.define :proxy do |proxy_config|
+    proxy_config.vm.box = "proxy"
+    proxy_config.vm.forward_port 8139, 8140
+    web_config.vm.network :hostonly, "192.168.50.103"
+  end
+
+  # Define a Web VM
+  config.vm.define :web do |web_config|
+    web_config.vm.box = "web"
+    web_config.vm.forward_port 80, 8080
+    web_config.vm.network :hostonly, "192.168.50.104"
+  end
+
   # Share hiera configuration.
   config.vm.share_folder "hiera", "/etc/puppet/hiera", "puppet/hiera", create: true
 end

diff --git a/puppet.conf b/puppet.conf
index cc3dcd40cdb78de6e87171514ec7fd5074271a1e..eae3864d547f81883ad2f77e783836df5dfb4117 100644 (file)
--- a/puppet.conf
+++ b/puppet.conf
@@ -19,7 +19,7 @@ ssl_client_header        = SSL_CLIENT_S_DN
 ssl_client_verify_header = SSL_CLIENT_VERIFY
 
 [agent]
-server                   = puppet.example.org
+server                   = puppet
 vardir                   = /var/lib/puppet
 ssldir                   = $vardir/ssl
 runinterval              = 7200