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.
| # | Location | File | Last Modified |
|---|---|---|---|
| 1 | chef-repo.zip\chef-repo\machine_cookbooks\ehmp_provision\attributes | jds.rb | Mon Aug 28 19:42:44 2017 UTC |
| 2 | chef-repo.zip\chef-repo\machine_cookbooks\ehmp_provision\attributes | jds.rb | Mon Oct 2 15:01:42 2017 UTC |
| Description | Between Files 1 and 2 |
|
|---|---|---|
| Text Blocks | Lines | |
| Unchanged | 3 | 40 |
| Changed | 2 | 8 |
| Inserted | 0 | 0 |
| Removed | 0 | 0 |
| 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 |
No regular expressions were active.
| 1 | # | |
| 2 | # Cookbook Name:: eh mp_provisi oner | |
| 3 | # Attribut es:: jds | |
| 4 | # | |
| 5 | ||
| 6 | default[:e hmp_provis ion][:jds] [:copy_fil es] = {} | |
| 7 | ||
| 8 | ########## ########## ########## ########## ########## ########## ########## ########## ########## ########## ########## ######### | |
| 9 | # jds spec ific aws c onfigurati on options | |
| 10 | default[:e hmp_provis ion][:jds] [:aws][:in stance_typ e] = "m3.l arge" | |
| 11 | default[:e hmp_provis ion][:jds] [:aws][:su bnet] = " REDACTED " | |
| 12 | default[:e hmp_provis ion][:jds] [:aws][:ss h_username ] = " REDACTED " | |
| 13 | default[:e hmp_provis ion][:jds] [:aws][:ss h_keyname] = " REDACTED " | |
| 14 | default[:e hmp_provis ion][:jds] [:aws][:ss h_key_path ] = "#{ENV ['HOME']}/ Projects/v istacore/. chef/keys/ #{node[:eh mp_provisi on][:jds][ :aws][:ssh _keyname]} " | |
| 15 | ########## ########## ########## ########## ########## ########## ########## ########## ########## ########## ########## ######### | |
| 16 | ||
| 17 | ########## ########## ########## ########## ########## ########## ########## ########## ########## ########## ########## ######### | |
| 18 | # jds spec ific vagra nt configu ration opt ions | |
| 19 | default[:e hmp_provis ion][:jds] [:vagrant] [:ip_addre ss] = " IP " | |
| 20 | default[:e hmp_provis ion][:jds] [:vagrant] [:provider _config] = { | |
| 21 | :memory => 1024 | |
| 22 | } | |
| 23 | default[:e hmp_provis ion][:jds] [:vagrant] [:shared_f olders] = [] | |
| 24 | ########## ########## ########## ########## ########## ########## ########## ########## ########## ########## ########## ######### |
Araxis Merge (but not the data content of this report) is Copyright © 1993-2016 Araxis Ltd (www.araxis.com). All rights reserved.