9. EPMO Open Source Coordination Office Redaction File Detail Report

Produced by Araxis Merge on 10/2/2017 1:40:03 PM Central Daylight Time. See www.araxis.com for information about Merge. This report uses XHTML and CSS2, and is best viewed with a modern standards-compliant browser. For optimum results when printing this report, use landscape orientation and enable printing of background images and colours in your browser.

9.1 Files compared

# Location File Last Modified
1 chef-repo.zip\chef-repo\machine_cookbooks\chef-repo_provision\recipes centos-6-local.rb Wed Jul 12 17:27:18 2017 UTC
2 chef-repo.zip\chef-repo\machine_cookbooks\chef-repo_provision\recipes centos-6-local.rb Mon Oct 2 12:37:42 2017 UTC

9.2 Comparison summary

Description Between
Files 1 and 2
Text Blocks Lines
Unchanged 2 74
Changed 1 2
Inserted 0 0
Removed 0 0

9.3 Comparison options

Whitespace
Character case Differences in character case are significant
Line endings Differences in line endings (CR and LF characters) are ignored
CR/LF characters Not shown in the comparison detail

9.4 Active regular expressions

No regular expressions were active.

9.5 Comparison detail

  1   #
  2   # Cookbook  Name:: ch ef-repo-pr ovision
  3   # Recipe::  centos-6- local
  4   #
  5  
  6   require 'c hef/provis ioning/vag rant_drive r'
  7   with_drive r 'vagrant '
  8    
  9   vagrant_bo x 'opscode -centos-6. 5-users' d o
  10     url "#{n ode[:commo n][:nexus_ url]}/nexu s/content/ repositori es/filerep o/third-pa rty/progra m/opscode/ centos/6.5 -users/cen tos-6.5-us ers.box"
  11   end
  12  
  13   osx_opts =  {}
  14   osx_opts[: box_name]  = 'opscode -centos-6. 5-users'
  15   osx_opts[: network] =  {
  16     :network _type => n ode[:machi ne][:netwo rk_type],
  17       :ip_addres s => " IP         "
  18   }
  19   osx_opts[: provider_c onfig] = {
  20     :provide r_name =>  node[:mach ine][:prov ider_name] ,
  21     :instanc e_name =>  "centos-6- #{node[:ma chine][:st ack]}",
  22     :memory  => 1024
  23   }
  24  
  25   machine "c entos-6-#{ node[:mach ine][:stac k]}" do
  26     machine_ options[:v agrant_con fig] = vag rant_confi g(osx_opts )
  27     converge  node[:mac hine][:con verge]
  28     file nod e[:machine ][:cert_fi le][:guest _path], no de[:machin e][:cert_f ile][:host _path]
  29     file "/U sers/vagra nt/Project s/vistacor e/.chef/kn ife.rb", " #{ENV['HOM E']}/Proje cts/vistac ore/.chef/ knife.rb"
  30     chef_env ironment n ode[:machi ne][:envir onment]
  31     attribut es(
  32       stack:  node[:mac hine][:sta ck],
  33       nexus_ url: node[ :common][: nexus_url] ,
  34       data_b ag_string:  node[:com mon][:data _bag_strin g]
  35     )
  36     role 'wo rkstation'
  37     action n ode[:machi ne][:actio n]
  38   end