Produced by Araxis Merge on 10/2/2017 1:40:04 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\rdk_provision\attributes | fetch-server.rb | Mon Jul 31 16:39:11 2017 UTC |
| 2 | chef-repo.zip\chef-repo\machine_cookbooks\rdk_provision\attributes | fetch-server.rb | Mon Oct 2 15:03:16 2017 UTC |
| Description | Between Files 1 and 2 |
|
|---|---|---|
| Text Blocks | Lines | |
| Unchanged | 3 | 38 |
| Changed | 2 | 6 |
| 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:: rd k_provisio ner | |
| 3 | # Attribut es:: fetch -server | |
| 4 | # | |
| 5 | ||
| 6 | default[:r dk_provisi on][:fetch _server][: copy_files ] = {} | |
| 7 | ||
| 8 | ########## ########## ########## ########## ########## ########## ########## ########## ########## ########## ########## ######### | |
| 9 | # rdk spec ific aws c onfigurati on options | |
| 10 | default[:r dk_provisi on][:fetch _server][: aws][:inst ance_type] = "m3.med ium" | |
| 11 | default[:r dk_provisi on][:fetch _server][: aws][:subn et] = "sub net-213b22 56" | |
| 12 | default[:r dk_provisi on][:fetch _server][: aws][:ssh_ username] = " REDACTED " | |
| 13 | default[:r dk_provisi on][:fetch _server][: aws][:ssh_ keyname] = " REDACTED " | |
| 14 | default[:r dk_provisi on][:fetch _server][: aws][:ssh_ key_path] = "#{ENV[' HOME']}/Pr ojects/vis tacore/.ch ef/keys/#{ node[:rdk_ provision] [:fetch_se rver][:aws ][:ssh_key name]}" | |
| 15 | ########## ########## ########## ########## ########## ########## ########## ########## ########## ########## ########## ######### | |
| 16 | ||
| 17 | ########## ########## ########## ########## ########## ########## ########## ########## ########## ########## ########## ######### | |
| 18 | # rdk spec ific vagra nt configu ration opt ions | |
| 19 | default[:r dk_provisi on][:fetch _server][: vagrant][: ip_address ] = " IP " | |
| 20 | default[:r dk_provisi on][:fetch _server][: vagrant][: provider_c onfig] = { } | |
| 21 | default[:r dk_provisi on][:fetch _server][: vagrant][: shared_fol ders] = [] | |
| 22 | ########## ########## ########## ########## ########## ########## ########## ########## ########## ########## ########## ######### |
Araxis Merge (but not the data content of this report) is Copyright © 1993-2016 Araxis Ltd (www.araxis.com). All rights reserved.