2. 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.

2.1 Files compared

#	Location	File	Last Modified
1	chef-repo.zip\chef-repo\machine_cookbooks\cds_provision\attributes	cds.rb	Thu Mar 23 16:44:18 2017 UTC
2	chef-repo.zip\chef-repo\machine_cookbooks\cds_provision\attributes	cds.rb	Mon Oct 2 14:35:18 2017 UTC

2.2 Comparison summary

Description	Between Files 1 and 2
Description	Text Blocks	Lines
Unchanged	3	42
Changed	2	8
Inserted	0	0
Removed	0	0

2.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

2.4 Active regular expressions

No regular expressions were active.

2.5 Comparison detail

	1	#
	2	# Cookbook Name:: cd s_provisio ner
	3	# Attribut es:: cds
	4	#
	5
	6	default[:c ds_provisi on][:cds][ :copy_file s] = {}
	7
	8	########## ########## ########## ########## ########## ########## ########## ########## ########## ########## ########## #########
	9	# cds spec ific aws c onfigurati on options
	10	default[:c ds_provisi on][:cds][ :aws][:ins tance_type ] = "m3.me dium"
	11	default[:c ds_provisi on][:cds][ :aws][:sub net] = " REDACTED "
	12	default[:c ds_provisi on][:cds][ :aws][:ssh _username] = " REDACTED "
	13	default[:c ds_provisi on][:cds][ :aws][:ssh _keyname] = " REDACTED "
	14	default[:c ds_provisi on][:cds][ :aws][:ssh _key_path] = "#{ENV[ 'HOME']}/P rojects/vi stacore/.c hef/keys/# {node[:cds _provision ][:cds][:a ws][:ssh_k eyname]}"
	15	########## ########## ########## ########## ########## ########## ########## ########## ########## ########## ########## #########
	16
	17	########## ########## ########## ########## ########## ########## ########## ########## ########## ########## ########## #########
	18	# cds spec ific vagra nt configu ration opt ions
	19	default[:c ds_provisi on][:cds][ :vagrant][ :ip_addres s] = " IP "
	20	default[:c ds_provisi on][:cds][ :vagrant][ :provider_ config] = {
	21	:memory => 1024,
	22	:cpus => 2
	23	}
	24	default[:c ds_provisi on][:cds][ :vagrant][ :shared_fo lders] = [ ]
	25	########## ########## ########## ########## ########## ########## ########## ########## ########## ########## ########## #########