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

11.1 Files compared

#	Location	File	Last Modified
1	chef-repo.zip\chef-repo\machine_cookbooks\chef-repo_provision\recipes	slave.rb	Mon May 8 19:59:52 2017 UTC
2	chef-repo.zip\chef-repo\machine_cookbooks\chef-repo_provision\recipes	slave.rb	Mon Oct 2 15:00:15 2017 UTC

11.2 Comparison summary

Description	Between Files 1 and 2
Description	Text Blocks	Lines
Unchanged	4	126
Changed	3	6
Inserted	0	0
Removed	0	0

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

11.4 Active regular expressions

No regular expressions were active.

11.5 Comparison detail

	1	#
	2	# Cookbook Name:: ma chine
	3	# Recipe:: slave
	4	#
	5
	6
	7	require 'c hef/provis ioning/aws _driver'
	8	with_drive r 'aws'
	9
	10	raise "ENV must incl ude SLAVE_ NAME to bo ot a slave " unless E NV.has_key ?('SLAVE_N AME')
	11
	12	node.defau lt[:machin e][:stack] = ENV['SL AVE_NAME']
	13
	14	instance_t ype = ENV[ "INSTANCE_ TYPE"] \|\| "m3.xlarge "
	15
	16	node.defau lt[:machin e][:conver gence_opti ons].merge ! ({
	17	install_ sh_url: "# {node[:com mon][:nexu s_url]}/ne xus/conten t/reposito ries/envir onment/vis tacore/che f-install/ install/1. 0.5.slave/ install-1. 0.5.slave. sh"
	18	})
	19
	20	machine_op tions = {
	21	:bootstr ap_options => {
	22	:key_name => " REDACTED ",
	23	:insta nce_type = > instance _type,
	24	:subnet_id => " REDACTED ",
	25	:secur ity_group_ ids => ["s g-a06097c6 ", "sg-294 6b14f"]
	26	},
	27	:image_i d => "ami- 826b0b95",
	28	:ssh_usern ame => " REDACTED ",
	29	:aws_tag s => set_e c2_tags,
	30	:converg ence_optio ns => node [:machine] [:converge nce_option s]
	31	}
	32
	33	chef_repo_ deps = par se_depende ncy_versio ns "chef-r epo_provis ion"
	34	machine_de ps = parse _dependenc y_versions "machine"
	35
	36	r_list = [ ]
	37	r_list << "recipe[pa ckages::en able_inter nal_source s@#{machin e_deps["pa ckages"]}] "
	38	r_list << "recipe[ro le_cookboo k::aws@#{m achine_dep s["role_co okbook"]}] "
	39	r_list << "recipe[wo rkstation: :slave@#{c hef_repo_d eps["works tation"]}] "
	40	r_list << "recipe[wo rkstation@ #{chef_rep o_deps["wo rkstation" ]}]"
	41
	42	machine "# {node[:mac hine][:sta ck]}" do
	43	machine_ options ma chine_opti ons
	44	converge node[:mac hine][:con verge]
	45	attribut es(
	46	stack: node[:mac hine][:sta ck],
	47	nexus_ url: node[ :common][: nexus_url] ,
	48	data_b ag_string: node[:com mon][:data _bag_strin g],
	49	jenkin s: {
	50	mast er: {
	51	en dpoint: "# {node[:'ch ef-repo_pr ovision'][ :slave][:j enkins_url ]}"
	52	}
	53	},
	54	workst ation: {
	55	user : "jenkins ",
	56	user _home: "/v ar/lib/jen kins",
	57	slav e: {
	58	ex ecutors: E NV["SLAVE_ EXECUTORS" ] \|\| "4"
	59	}
	60	}
	61	)
	62	file "/# {::Chef::C onfig.clie nt_key.spl it("/")[-1 ]}", ::Che f::Config. client_key
	63	chef_env ironment " _default"
	64	run_list r_list
	65	action n ode[:machi ne][:actio n]
	66	end