From 3cf72536b7508f4fefcb20ec0b52dea414ce1e91 Mon Sep 17 00:00:00 2001
From: Lorin Hochstein <lorin.hochstein@sendgrid.com>
Date: Thu, 5 Feb 2015 22:14:19 -0500
Subject: [PATCH] Add vagrantfile, ansible.cfg, inventory

---
 ch06/playbooks/Vagrantfile | 72 +++-----------------------------------
 ch06/playbooks/ansible.cfg |  3 ++
 ch06/playbooks/inventory   |  2 +-
 3 files changed, 8 insertions(+), 69 deletions(-)

diff --git a/ch06/playbooks/Vagrantfile b/ch06/playbooks/Vagrantfile
index 12d9294..ec7e77b 100644
--- a/ch06/playbooks/Vagrantfile
+++ b/ch06/playbooks/Vagrantfile
@@ -1,71 +1,7 @@
-# -*- mode: ruby -*-
-# vi: set ft=ruby :
+VAGRANTFILE_API_VERSION = "2"
 
-# All Vagrant configuration is done below. The "2" in Vagrant.configure
-# configures the configuration version (we support older styles for
-# backwards compatibility). Please don't change it unless you know what
-# you're doing.
-Vagrant.configure(2) do |config|
-  # The most common configuration options are documented and commented below.
-  # For a complete reference, please see the online documentation at
-  # https://docs.vagrantup.com.
-
-  # Every Vagrant development environment requires a box. You can search for
-  # boxes at https://atlas.hashicorp.com/search.
+Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
   config.vm.box = "ubuntu/trusty64"
-
-  # Disable automatic box update checking. If you disable this, then
-  # boxes will only be checked for updates when the user runs
-  # `vagrant box outdated`. This is not recommended.
-  # config.vm.box_check_update = false
-
-  # Create a forwarded port mapping which allows access to a specific port
-  # within the machine from a port on the host machine. In the example below,
-  # accessing "localhost:8080" will access port 80 on the guest machine.
-  # config.vm.network "forwarded_port", guest: 80, host: 8080
-
-  # Create a private network, which allows host-only access to the machine
-  # using a specific IP.
-  # config.vm.network "private_network", ip: "192.168.33.10"
-
-  # Create a public network, which generally matched to bridged network.
-  # Bridged networks make the machine appear as another physical device on
-  # your network.
-  # config.vm.network "public_network"
-
-  # Share an additional folder to the guest VM. The first argument is
-  # the path on the host to the actual folder. The second argument is
-  # the path on the guest to mount the folder. And the optional third
-  # argument is a set of non-required options.
-  # config.vm.synced_folder "../data", "/vagrant_data"
-
-  # Provider-specific configuration so you can fine-tune various
-  # backing providers for Vagrant. These expose provider-specific options.
-  # Example for VirtualBox:
-  #
-  # config.vm.provider "virtualbox" do |vb|
-  #   # Display the VirtualBox GUI when booting the machine
-  #   vb.gui = true
-  #
-  #   # Customize the amount of memory on the VM:
-  #   vb.memory = "1024"
-  # end
-  #
-  # View the documentation for the provider you are using for more
-  # information on available options.
-
-  # Define a Vagrant Push strategy for pushing to Atlas. Other push strategies
-  # such as FTP and Heroku are also available. See the documentation at
-  # https://docs.vagrantup.com/v2/push/atlas.html for more information.
-  # config.push.define "atlas" do |push|
-  #   push.app = "YOUR_ATLAS_USERNAME/YOUR_APPLICATION_NAME"
-  # end
-
-  # Enable provisioning with a shell script. Additional provisioners such as
-  # Puppet, Chef, Ansible, Salt, and Docker are also available. Please see the
-  # documentation for more information about their specific syntax and use.
-  # config.vm.provision "shell", inline: <<-SHELL
-  #   sudo apt-get update
-  #   sudo apt-get install -y apache2
-  # SHELL
+  config.vm.network "forwarded_port", guest: 80, host: 8080
+  config.vm.network "forwarded_port", guest: 443, host: 8443
 end
diff --git a/ch06/playbooks/ansible.cfg b/ch06/playbooks/ansible.cfg
index 998812f..8187fd5 100644
--- a/ch06/playbooks/ansible.cfg
+++ b/ch06/playbooks/ansible.cfg
@@ -3,3 +3,6 @@ hostfile = inventory
 remote_user = vagrant
 private_key_file = .vagrant/machines/default/virtualbox/private_key
 host_key_checking = False
+
+[ssh_connection]
+ssh_args = -o ControlMaster=auto -o ControlPersist=60s -o ForwardAgent=yes
diff --git a/ch06/playbooks/inventory b/ch06/playbooks/inventory
index 23c16b4..3386f5e 100644
--- a/ch06/playbooks/inventory
+++ b/ch06/playbooks/inventory
@@ -1 +1 @@
-testserver ansible_ssh_host=127.0.0.1 ansible_ssh_port=2222
+web ansible_ssh_host=127.0.0.1 ansible_ssh_port=2222
-- 
2.44.0