christian-fei · March 29, 2016 12:39 · Mar 29, 2016 · Mar 29, 2016 · Mar 29, 2016 · Mar 25, 2016
diff --git a/devops-workshop.md b/devops-workshop.md
@@ -768,7 +768,11 @@ Run `vagrant provision test`
 
 # Monitoring
 
-With Sensu [on-site]
+You'll find the *monitoring* cookbook [**here**](https://github.com/joebew42/dropwizard-sample-app/tree/devops-workshop/cookbooks)
+
+**Exercise**
+
+Try to integrate the cookbook in your infrastructure. See the previous section.
 
 # Cloud infrastructure
 

diff --git a/devops-workshop.md b/devops-workshop.md
@@ -1,3 +1,11 @@
+* [Creating a cookbook for our CI server](#creating-a-cookbook-for-our-ci-server)
+* [Adding a Test Machine](#adding-a-test-machine)
+* [Automates the application deployment](#automates-the-application-deployment)
+* [Deployment automation in Jenkins](#deployment-automation-in-jenkins)
+* [Logging](#logging)
+* [Monitoring](#monitoring)
+* [Cloud infrastructure](#cloud-infrastructure)
+
 # Creating a cookbook for our CI server
 
 ## Requirements

diff --git a/devops-workshop.md b/devops-workshop.md
@@ -723,11 +723,44 @@ Can you add the same "code coverage" for the **ci** cookbook ?
 
 ### Send logs from test/production environment
 
-TODO
+root Vagrantfile
+
+```
+...
+  ['test', 'production'].each_with_index do |environment, index|
+    config.vm.define "#{environment}" do |machine|
+      machine.vm.hostname = "#{environment}"
+      machine.vm.network :private_network, ip: "192.168.33.#{102 + index}"
+
+      machine.vm.provider 'virtualbox' do |vb|
+        vb.memory = 1024
+      end
+
+      machine.vm.provision :chef_zero, install: true do |chef|
+        chef.verbose_logging
+        chef.nodes_path = 'cookbooks'
+        chef.file_cache_path = '/var/chef/cache'
+        chef.add_recipe 'sample-app::default'
+        chef.add_recipe 'sample-app::nginx'
+        chef.add_recipe 'sample-app::application_deployment'
+        chef.add_recipe 'logging::client'
+        chef.json = {
+          "databases": ["db_notes"],
+          "logging": {
+              "host": "192.168.33.110"
+          }
+        }
+      end
+    end
+  end
+...
+```
+
+Run `vagrant provision test`
 
 # Monitoring
 
-TODO
+With Sensu [on-site]
 
 # Cloud infrastructure
 

diff --git a/devops-workshop.md b/devops-workshop.md
@@ -14,9 +14,10 @@ cd dropwizard-sample-app/cookbooks/
 ## Create the ci cookbook
 
 ```
-knife cookbook create ci -o .
+chef generate cookbook ci
 ```
-This creates a `scaffold` of the cookbook. The `-o .` option tells knife to create the cookbook in the current directory (default is /home/user/.chef/cookbooks/xxx).
+
+This will create a `scaffold` of the cookbook.
 
 ### Our first recipe
 
@@ -118,14 +119,6 @@ Adding [`java`](https://supermarket.chef.io/cookbooks/java) as cookbook dependec
 depends 'java', '~> 1.39.0'
 ```
 
-Then, we have to use `Berkshelf` to tells kitchen how to resolve external cookbook dependencies (such as `java`). Create the file `Berksfile` with these lines:
-
-```
-source "https://api.berkshelf.com"
-
-metadata
-```
-
 Put some java's specific attributes in `attributes/java.rb`
 
 ```

diff --git a/devops-workshop.md b/devops-workshop.md
@@ -841,6 +841,18 @@ resource "aws_security_group" "sample-app" {
         protocol  = "tcp"
         cidr_blocks = ["0.0.0.0/0"]
     }
+    ingress {
+        from_port = 22
+        to_port   = 22
+        protocol  = "tcp"
+        cidr_blocks = ["0.0.0.0/0"]
+    }
+    egress {
+        from_port = 0
+        to_port = 0
+        protocol = "-1"
+        cidr_blocks = ["0.0.0.0/0"]
+    }
 }
 
 resource "aws_instance" "sample-app" {

diff --git a/devops-workshop.md b/devops-workshop.md
@@ -755,7 +755,7 @@ Define packer template in `packer/sample-app.json`
     "aws_secret_key": "",
     "name": "default",
     "region": "eu-central-1",
-    "source_ami": "ami-60baaa0c",
+    "source_ami": "ami-7e9b7c11",
     "vpc_id": "",
     "subnet_id": ""
   },
@@ -799,7 +799,7 @@ Create a Packer a `packer/private.json` file to customize Packer variables:
 {
   "aws_access_key": "{your access key}",
   "aws_secret_key": "{your secret key}",
-  "name": "{your name}",
+  "name": "{your name}"
 }
 ```
 
@@ -813,6 +813,96 @@ Run Packer passing your custom configuration file and the template as arguments:
 
 Take note of generated **AMI id**.
 
-## Terraform
+## Create AWS stack with Terraform
 
-TODO
+Create terraform directory:
+
+```
+mkdir terraform
+cd terraform
+```
+
+Define terraform template in `terraform/sample-app.tf`
+
+```
+provider "aws" {
+    access_key = "${var.access_key}"
+    secret_key = "${var.secret_key}"
+    region = "eu-central-1"
+}
+
+resource "aws_security_group" "sample-app" {
+    name = "${var.name}-devops-jumpstart-sample-app"
+    description = "Security group for web that allows web traffic from internet"
+
+    ingress {
+        from_port = 80
+        to_port   = 80
+        protocol  = "tcp"
+        cidr_blocks = ["0.0.0.0/0"]
+    }
+}
+
+resource "aws_instance" "sample-app" {
+    instance_type = "t2.small"
+    ami = "${var.ami}"
+    key_name = "devops-jumpstart"
+    security_groups = ["${aws_security_group.sample-app.name}"]
+
+    tags {
+      Name = "${var.name} devops-jumpstart sample-app"
+    }
+}
+
+output "ip" {
+    value = "${aws_instance.sample-app.public_ip}"
+}
+```
+
+Define terraform variables in `terraform/variables.tf`
+
+```
+variable "access_key" {}
+variable "secret_key" {}
+variable "name" {
+    default = "user"
+}
+variable "ami" {}
+```
+
+Define terraform variables values in `terraform/terraform.tfvars`
+
+```
+access_key = "{your access key}"
+secret_key = "{your secret key}"
+ami = "{packer generated AMI id}"
+name = "{your name}"
+```
+
+Check terraform build plan
+
+```
+terraform plan
+```
+
+Create stack
+
+```
+terraform apply
+```
+
+Show stack state
+
+```
+terraform show
+```
+
+Take note of generated instance IP address.
+Visit instance IP address in a browser.
+
+Get AWS instance details using aws client
+
+```
+aws configure
+aws ec2 describe-instances --filters "Name=tag:Name,Values={user} devops-jumpstart blog"
+```
diff --git a/devops-workshop.md b/devops-workshop.md
@@ -738,9 +738,80 @@ TODO
 
 # Cloud infrastructure
 
-## Packer
+## Create AWS AMI with Packer
+
+Go back to project root and create `packer` directory
+
+```
+mkdir packer
+```
+
+Define packer template in `packer/sample-app.json`
+
+```
+{
+  "variables": {
+    "aws_access_key": "",
+    "aws_secret_key": "",
+    "name": "default",
+    "region": "eu-central-1",
+    "source_ami": "ami-60baaa0c",
+    "vpc_id": "",
+    "subnet_id": ""
+  },
+
+  "builders": [
+    {
+      "access_key": "{{user `aws_access_key`}}",
+      "secret_key": "{{user `aws_secret_key`}}",
+      "type": "amazon-ebs",
+      "region": "{{user `region`}}",
+      "source_ami": "{{user `source_ami`}}",
+      "ami_virtualization_type": "hvm",
+      "vpc_id": "{{user `vpc_id`}}",
+      "subnet_id": "{{user `subnet_id`}}",
+      "instance_type": "t2.small",
+      "ssh_username": "ubuntu",
+      "ami_name": "{{user `name`}}-sample-app-{{isotime \"20060102-150405\"}}",
+      "tags":  {
+        "Name": "{{user `name`}}-sample-app-{{isotime \"20060102-150405\"}}"
+      }
+    }
+  ],
+
+  "provisioners": [
+    {
+      "type": "chef-solo",
+      "cookbook_paths": ["berks-cookbooks"],
+      "run_list": [
+        "sample-app::default",
+        "sample-app::nginx",
+        "sample-app::application_deployment"
+      ]
+    }
+  ]
+}
+```
 
-TODO
+Create a Packer a `packer/private.json` file to customize Packer variables:
+
+```
+{
+  "aws_access_key": "{your access key}",
+  "aws_secret_key": "{your secret key}",
+  "name": "{your name}",
+}
+```
+
+Vendorize all needed cookbooks making them availabe to Packer:
+
+`berks vendor`
+
+Run Packer passing your custom configuration file and the template as arguments:
+
+`packer build -var-file=packer/private.json packer/sample-app.json`
+
+Take note of generated **AMI id**.
 
 ## Terraform
 

diff --git a/devops-workshop.md b/devops-workshop.md
@@ -726,4 +726,22 @@ Visits `http://192.168.33.110:5601` for Kibana Dashboard
 
 Take a look at *unit* and *integration* tests!
 
-Can you add the same "code coverage" for the **ci** cookbook ?
+Can you add the same "code coverage" for the **ci** cookbook ?
+
+### Send logs from test/production environment
+
+TODO
+
+# Monitoring
+
+TODO
+
+# Cloud infrastructure
+
+## Packer
+
+TODO
+
+## Terraform
+
+TODO
diff --git a/devops-workshop.md b/devops-workshop.md
@@ -720,6 +720,8 @@ Run `berks update`
 
 Run `vagrant up management`
 
+Visits `http://192.168.33.110:5601` for Kibana Dashboard
+
 **Exercise**
 
 Take a look at *unit* and *integration* tests!

diff --git a/devops-workshop.md b/devops-workshop.md
@@ -669,4 +669,59 @@ We have already create the `test` machine that is a production-like machine. We
 ...
 ```
 
-Run `vagrant up production`
+Run `vagrant up production`
+
+# Logging
+
+We are going to provision an ELK stack (elasticsearch, logstash and kibana)
+
+For practicality (time!) reason a simple logging cookbook can be found [**here**](https://github.com/joebew42/dropwizard-sample-app/tree/devops-workshop/cookbooks)
+
+The complete guide for the logging cookbook can be found [**here**](https://github.com/xpeppers/devops-jumpstart/wiki/4.-Centralized-logging)
+
+## Add a new machine for logging purpose
+
+Adds the cookbook `logging` as berks dependency
+
+*Berksfile*
+
+```
+source 'https://supermarket.chef.io'
+
+cookbook 'sample-app', path: './cookbooks/sample-app'
+cookbook 'ci',         path: './cookbooks/ci'
+cookbook 'logging',    path: './cookbooks/logging'
+```
+
+Run `berks update`
+
+*Vagrantfile*
+
+```
+...
+  config.vm.define "management" do |management|
+    management.vm.hostname = "management"
+    management.vm.network :private_network, ip: '192.168.33.110'
+
+    management.vm.provider 'virtualbox' do |vb|
+      vb.memory = 1024
+    end
+
+    management.vm.provision :chef_zero, install: true do |chef|
+      chef.verbose_logging
+      chef.nodes_path = 'cookbooks'
+      chef.file_cache_path = '/var/chef/cache'
+      chef.add_recipe 'logging::default'
+      chef.json = {}
+    end
+  end
+...
+```
+
+Run `vagrant up management`
+
+**Exercise**
+
+Take a look at *unit* and *integration* tests!
+
+Can you add the same "code coverage" for the **ci** cookbook ?
diff --git a/devops-workshop.md b/devops-workshop.md
@@ -667,4 +667,6 @@ We have already create the `test` machine that is a production-like machine. We
     end
   end
 ...
-```
+```
+
+Run `vagrant up production`
diff --git a/devops-workshop.md b/devops-workshop.md
@@ -420,7 +420,50 @@ run `vagrant up test` in order to boot the test machine.
 
 ## We'd like to add a reverse proxy in production
 
-TODO: nginx recipe
+*recipes/nginx.rb*
+
+```
+package 'nginx'
+
+cookbook_file '/etc/nginx/sites-available/default' do
+  source 'nginx-default-site'
+  notifies :restart, 'service[nginx]', :delayed
+end
+
+service 'nginx'
+```
+
+*files/nginx-default-site*
+
+```
+upstream backend {
+    server localhost:8080;
+}
+
+server {
+        listen 80 default_server;
+        listen [::]:80 default_server ipv6only=on;
+
+        server_name localhost;
+
+        location / {
+                proxy_pass http://backend;
+        }
+}
+```
+
+Now we can add the recipe in the root Vagrantfile
+
+*Vagrantfile*
+
+```
+...
+    chef.add_recipe 'sample-app::default'
+    chef.add_recipe 'sample-app::nginx'
+...
+```
+
+run `vagrant provision test`
 
 # Automates the application deployment
 
@@ -515,6 +558,7 @@ Update the root Vagrantfile in order to execute this recipe:
       chef.nodes_path = 'cookbooks'
       chef.file_cache_path = '/var/chef/cache'
       chef.add_recipe 'sample-app::default'
+      chef.add_recipe 'sample-app::nginx'
       chef.add_recipe 'sample-app::application_deployment'
       chef.json = {
         "databases": ["db_notes"]
@@ -614,6 +658,7 @@ We have already create the `test` machine that is a production-like machine. We
         chef.nodes_path = 'cookbooks'
         chef.file_cache_path = '/var/chef/cache'
         chef.add_recipe 'sample-app::default'
+        chef.add_recipe 'sample-app::nginx'
         chef.add_recipe 'sample-app::application_deployment'
         chef.json = {
           "databases": ["db_notes"]

diff --git a/devops-workshop.md b/devops-workshop.md
@@ -603,7 +603,7 @@ We have already create the `test` machine that is a production-like machine. We
   ['test', 'production'].each_with_index do |environment, index|
     config.vm.define "#{environment}" do |machine|
       machine.vm.hostname = "#{environment}"
-      machine.vm.network :private_network, ip: "192.168.33.#{101 + index}"
+      machine.vm.network :private_network, ip: "192.168.33.#{102 + index}"
 
       machine.vm.provider 'virtualbox' do |vb|
         vb.memory = 1024

diff --git a/devops-workshop.md b/devops-workshop.md
@@ -594,4 +594,32 @@ Now we can create the job on jenkins to automates the deploy on test machine. We
 
 ## Deploy in production ? Simple now !
 
-TODO
+We have already create the `test` machine that is a production-like machine. We have only to add a new machine in the root Vagrantfile:
+
+*Vagrantfile*
+
+```
+...
+  ['test', 'production'].each_with_index do |environment, index|
+    config.vm.define "#{environment}" do |machine|
+      machine.vm.hostname = "#{environment}"
+      machine.vm.network :private_network, ip: "192.168.33.#{101 + index}"
+
+      machine.vm.provider 'virtualbox' do |vb|
+        vb.memory = 1024
+      end
+
+      machine.vm.provision :chef_zero, install: true do |chef|
+        chef.verbose_logging
+        chef.nodes_path = 'cookbooks'
+        chef.file_cache_path = '/var/chef/cache'
+        chef.add_recipe 'sample-app::default'
+        chef.add_recipe 'sample-app::application_deployment'
+        chef.json = {
+          "databases": ["db_notes"]
+        }
+      end
+    end
+  end
+...
+```
diff --git a/devops-workshop.md b/devops-workshop.md
@@ -418,6 +418,10 @@ We are telling the cookbook to use the new attribute `databases` with only a dat
 
 run `vagrant up test` in order to boot the test machine.
 
+## We'd like to add a reverse proxy in production
+
+TODO: nginx recipe
+
 # Automates the application deployment
 
 In order to demostrate how is possible to automates an application deployment we are going to build from scratch a deployment workflow for our application. To do this we use [`fabric`](http://docs.fabfile.org/en/1.10/)

diff --git a/devops-workshop.md b/devops-workshop.md
@@ -586,4 +586,8 @@ end
 
 Run the provision of the `ci` machine: `vagrant provision ci`
 
-Now we can crete the job on jenkins for deploy purpose.
+Now we can create the job on jenkins to automates the deploy on test machine. We'll adds a simple acceptance test with a `curl` command.
+
+## Deploy in production ? Simple now !
+
+TODO
diff --git a/devops-workshop.md b/devops-workshop.md
@@ -548,6 +548,7 @@ end
 
 package 'git'
 package 'python-virtualenv'
+package 'python-dev'
 
 mysql_service 'test' do
   port '3306'

diff --git a/devops-workshop.md b/devops-workshop.md
@@ -583,4 +583,6 @@ remote_file "#{node['jenkins']['master']['home']}/.ssh/deployer" do
 end
 ```
 
+Run the provision of the `ci` machine: `vagrant provision ci`
+
 Now we can crete the job on jenkins for deploy purpose.
diff --git a/devops-workshop.md b/devops-workshop.md
@@ -522,3 +522,65 @@ Run the provision of the test machine: `vagrant provision test`
 
 ## Authorize Jenkins to perform deploy on Test machine
 
+In order to authorize jenkins to perform deploy on test machine we have to change the default recipe:
+
+* Install the virtualenv
+* Install the *deployer* private key
+* Add a jenkins plugin to run python code in a virtualenv
+
+`cd cookbooks/ci`
+
+*recipes/default.rb*
+
+```
+include_recipe 'java'
+include_recipe 'maven'
+include_recipe 'jenkins::master'
+
+jenkins_plugin 'git'
+jenkins_plugin 'greenballs'
+jenkins_plugin 'junit'
+jenkins_plugin 'jobConfigHistory'
+jenkins_plugin 'delivery-pipeline-plugin'
+jenkins_plugin 'shiningpanda' do
+  notifies :restart, 'service[jenkins]', :delayed
+end
+
+package 'git'
+package 'python-virtualenv'
+
+mysql_service 'test' do
+  port '3306'
+  version '5.5'
+  initial_root_password 'root'
+  action [:create, :start]
+end
+
+mysql2_chef_gem 'default' do
+  action [:install]
+end
+
+mysql_database 'db_notes_test' do
+  connection(
+    :host     => '127.0.0.1',
+    :username => 'root',
+    :password => 'root'
+  )
+  action :create
+end
+
+directory "#{node['jenkins']['master']['home']}/.ssh" do
+  owner node['jenkins']['master']['user']
+  group node['jenkins']['master']['group']
+  mode '0700'
+end
+
+remote_file "#{node['jenkins']['master']['home']}/.ssh/deployer" do
+  source 'https://gist.githubusercontent.com/joebew42/440c14b70ee305af31f6/raw/2ccd359966d523a026123a434dba262ca9a90e79/deployer'
+  owner node['jenkins']['master']['user']
+  group node['jenkins']['master']['group']
+  mode '0600'
+end
+```
+
+Now we can crete the job on jenkins for deploy purpose.
diff --git a/devops-workshop.md b/devops-workshop.md
@@ -244,8 +244,7 @@ jenkins_plugin 'git'
 jenkins_plugin 'greenballs'
 jenkins_plugin 'junit'
 jenkins_plugin 'jobConfigHistory'
-jenkins_plugin 'delivery-pipeline-plugin'
-jenkins_plugin 'build-pipeline-plugin' do
+jenkins_plugin 'delivery-pipeline-plugin' do
   notifies :restart, 'service[jenkins]', :delayed
 end
 
@@ -519,4 +518,7 @@ Update the root Vagrantfile in order to execute this recipe:
     end
 ...
 ```
-Run the provision of the test machine: `vagrant provision test`
+Run the provision of the test machine: `vagrant provision test`
+
+## Authorize Jenkins to perform deploy on Test machine
+
diff --git a/devops-workshop.md b/devops-workshop.md
@@ -474,7 +474,7 @@ We want to extend our basic pipeline with a specific task for the deploy. There
 cd cookbooks/sample-app
 ```
 
-## An home and a user used application deployment
+## An home and a user used for application deployment
 
 *recipes/application_deployment.rb*
 

diff --git a/devops-workshop.md b/devops-workshop.md
@@ -479,5 +479,44 @@ cd cookbooks/sample-app
 *recipes/application_deployment.rb*
 
 ```
-TODO
-```
+user 'deployer' do
+  shell '/bin/bash'
+  home '/home/deployer'
+  manage_home true
+  action :create
+end
+
+directory '/home/deployer/.ssh' do
+  owner 'deployer'
+  group 'deployer'
+  mode '0700'
+end
+
+remote_file '/home/deployer/.ssh/authorized_keys' do
+  source 'https://gist.githubusercontent.com/joebew42/cfb85d25199b94461c27/raw/ebf41312424286b302d4b7b8f645931d12e0c4b8/deployer.pub'
+  owner 'deployer'
+  group 'deployer'
+  mode '0600'
+  action :create
+end
+```
+
+Update the root Vagrantfile in order to execute this recipe:
+
+*Vagrantfile*
+
+```
+...
+    test.vm.provision :chef_zero, install: true do |chef|
+      chef.verbose_logging
+      chef.nodes_path = 'cookbooks'
+      chef.file_cache_path = '/var/chef/cache'
+      chef.add_recipe 'sample-app::default'
+      chef.add_recipe 'sample-app::application_deployment'
+      chef.json = {
+        "databases": ["db_notes"]
+      }
+    end
+...
+```
+Run the provision of the test machine: `vagrant provision test`
diff --git a/devops-workshop.md b/devops-workshop.md
@@ -468,10 +468,16 @@ Let's try to deploy the application on the `test` machine
 
 # Deployment automation in Jenkins
 
-We want to extend our basic pipeline with a specific task for the deploy. There are some changes we have to introduce to the cookbook `jenkins`:
+We want to extend our basic pipeline with a specific task for the deploy. There are some changes we have to introduce in the cookbook `sample-app`:
 
 ```
-cd cookbooks/jenkins
+cd cookbooks/sample-app
 ```
 
-TODO
+## An home and a user used application deployment
+
+*recipes/application_deployment.rb*
+
+```
+TODO
+```
diff --git a/devops-workshop.md b/devops-workshop.md
@@ -465,3 +465,13 @@ def migrate():
 Let's try to deploy the application on the `test` machine
 
 `fab -u vagrant -H 192.168.33.102 deploy`
+
+# Deployment automation in Jenkins
+
+We want to extend our basic pipeline with a specific task for the deploy. There are some changes we have to introduce to the cookbook `jenkins`:
+
+```
+cd cookbooks/jenkins
+```
+
+TODO
diff --git a/devops-workshop.md b/devops-workshop.md
@@ -421,4 +421,47 @@ run `vagrant up test` in order to boot the test machine.
 
 # Automates the application deployment
 
-TODO
+In order to demostrate how is possible to automates an application deployment we are going to build from scratch a deployment workflow for our application. To do this we use [`fabric`](http://docs.fabfile.org/en/1.10/)
+
+**requirements**
+
+* Python 2.7
+* virtualenv
+
+install fabric by `pip install -r requirements.txt`
+
+then create our first and very simple deploy workflow:
+
+*fabfile.py*
+
+```
+from fabric.api import *
+
+env.warn_only = True
+
+def deploy():
+    stop()
+    copy_artefact()
+    copy_configuration()
+    migrate()
+    start()
+
+def copy_artefact():
+    put("target/sample-app-1.0-SNAPSHOT.jar", "/home/vagrant/")
+
+def copy_configuration():
+    put("configuration.yml", "/home/vagrant/")
+
+def start():
+    run("screen -S sample-app -d -m java -jar /home/vagrant/sample-app-1.0-SNAPSHOT.jar server configuration.yml", pty=False)
+
+def stop():
+    run("screen -S sample-app -X quit", pty=False)
+
+def migrate():
+    run("java -jar /home/vagrant/sample-app-1.0-SNAPSHOT.jar db migrate configuration.yml")
+```
+
+Let's try to deploy the application on the `test` machine
+
+`fab -u vagrant -H 192.168.33.102 deploy`
diff --git a/devops-ci-chef.md → devops-workshop.md b/devops-ci-chef.md → devops-workshop.md
diff --git a/devops-ci-chef.md b/devops-ci-chef.md
@@ -415,4 +415,10 @@ Now we can add a new `test` machine in our root Vagrantfile
   end
 ...
 ```
-We are telling the cookbook to use the new attribute `databases` with only a database. Cool!
+We are telling the cookbook to use the new attribute `databases` with only a database. Cool!
+
+run `vagrant up test` in order to boot the test machine.
+
+# Automates the application deployment
+
+TODO
diff --git a/devops-ci-chef.md b/devops-ci-chef.md
@@ -331,4 +331,88 @@ cookbook 'sample-app', path: './cookbooks/sample-app'
 cookbook 'ci', path: './cookbooks/ci'
 ```
 
-run `berks update`
+run `berks update`
+
+# Adding a Test machine
+
+The `test` machine is used to simulate a production like environment. We can use to test deploy task or as a `staging` phase.
+
+The cookbook used to proviion the test machine is the same used for `dev` environment, with small changes.
+
+```
+cd cookbooks/sample-app
+```
+
+We have to modify the `default` recipe:
+
+*recipes/default.rb*
+
+```
+...
+['db_notes', 'db_notes_test'].each do |database_name|
+  mysql_database database_name do
+    connection(
+      :host     => '127.0.0.1',
+      :username => 'root',
+      :password => 'root'
+    )
+    action :create
+  end
+end
+...
+```
+
+In a `test` environment we don't need a database used for integration, so we can continue by extracting the list `['db_notes', 'db_notes_test']` as attribute of the cookbook, in order to assign new values programmatically during the provision.
+
+*atributes/default.rb*
+
+```
+default['java']['jdk_version'] = '7'
+
+default['databases'] = ['db_notes', 'db_notes_test']
+```
+
+*recipes/default.rb*
+
+```
+...
+node['databases'].each do |database_name|
+  mysql_database database_name do
+    connection(
+      :host     => '127.0.0.1',
+      :username => 'root',
+      :password => 'root'
+    )
+    action :create
+  end
+end
+...
+```
+
+Now we can add a new `test` machine in our root Vagrantfile
+
+*Vagrantfile*
+
+```
+...
+  config.vm.define "test" do |test|
+    test.vm.hostname = "test"
+    test.vm.network :private_network, ip: '192.168.33.102'
+
+    test.vm.provider 'virtualbox' do |vb|
+      vb.memory = 1024
+    end
+
+    test.vm.provision :chef_zero, install: true do |chef|
+      chef.verbose_logging
+      chef.nodes_path = 'cookbooks'
+      chef.file_cache_path = '/var/chef/cache'
+      chef.add_recipe 'sample-app::default'
+      chef.json = {
+        "databases": ["db_notes"]
+      }
+    end
+  end
+...
+```
+We are telling the cookbook to use the new attribute `databases` with only a database. Cool!
diff --git a/devops-ci-chef.md b/devops-ci-chef.md
@@ -294,3 +294,41 @@ describe 'ci::default' do
   end
 end
 ```
+
+## Adding the CI machine in the root Vagrantfile
+
+*Vagrantfile*
+
+```
+...
+  config.vm.define "ci" do |ci|
+    ci.vm.hostname = "ci"
+    ci.vm.network :private_network, ip: '192.168.33.101'
+
+    ci.vm.provider 'virtualbox' do |vb|
+      vb.memory = 1024
+    end
+
+    ci.vm.provision :chef_zero, install: true do |chef|
+      chef.verbose_logging
+      chef.nodes_path = 'cookbooks'
+      chef.file_cache_path = '/var/chef/cache'
+      chef.add_recipe 'ci::default'
+      chef.json = {}
+    end
+  end
+...
+```
+
+And then adds the cookbook `ci` as dependecy
+
+*Berksfile*
+
+```
+source 'https://supermarket.chef.io'
+
+cookbook 'sample-app', path: './cookbooks/sample-app'
+cookbook 'ci', path: './cookbooks/ci'
+```
+
+run `berks update`
diff --git a/devops-ci-chef.md b/devops-ci-chef.md
@@ -192,7 +192,7 @@ include_recipe 'jenkins::master'
 
 run the converge with `kitchen converge`
 
-Visits: `http://192.168.33.101:8080` :D
+Visits: `http://192.168.33.33:8080` :D
 
 #### Just one simple integration test