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\no_internet | no_internet.rb | Fri Oct 9 17:53:30 2015 UTC |
| 2 | chef-repo.zip\chef-repo\no_internet | no_internet.rb | Mon Oct 2 15:07:23 2017 UTC |
| Description | Between Files 1 and 2 |
|
|---|---|---|
| Text Blocks | Lines | |
| Unchanged | 2 | 160 |
| Changed | 1 | 2 |
| 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 | # Rakefile for no-in ternet dep loys | |
| 3 | # | |
| 4 | ||
| 5 | task :writ e_prod_set tings, :st ack do |t, args| | |
| 6 | st ack = args [:stack] | |
| 7 | db _path = "/ tmp/#{stac k}.json" | |
| 8 | Fi le.open(db _path, "w+ "){ |f| | |
| 9 | f.wr ite(JSON.p retty_gene rate(prod_ settings(s tack))) | |
| 10 | } | |
| 11 | kn ife_data_b ag_from_fi le(db_path ) | |
| 12 | end | |
| 13 | ||
| 14 | def knife_ data_bag_f rom_file(d b_path) | |
| 15 | `/ opt/chefdk /bin/knife data bag from file production _settings #{db_path} ` | |
| 16 | end | |
| 17 | ||
| 18 | def prod_s ettings(st ack) | |
| 19 | { | |
| 20 | "id" => st ack, | |
| 21 | "ssh_usern ame" => " REDACTED ", | |
| 22 | "ssh_key" => "#{ENV[ 'HOME']}/P rojects/vi stacore/.c hef/keys/v agrantaws_ c82a142d52 05", | |
| 23 | "jds" => { | |
| 24 | "ip_addr ess" => kn ife_search _for_ip("j ds", stack , "aws") | |
| 25 | }, | |
| 26 | "solr" => { | |
| 27 | "ip_addr ess" => kn ife_search _for_ip("s olr", stac k, "aws") | |
| 28 | }, | |
| 29 | "mocks" => { | |
| 30 | "ip_addr ess" => kn ife_search _for_ip("m ocks", sta ck, "aws") | |
| 31 | }, | |
| 32 | "vista-pan orama" => { | |
| 33 | "ip_addr ess" => kn ife_search _for_ip("v ista-panor ama", stac k, "aws") | |
| 34 | }, | |
| 35 | "vista-kod ak" => { | |
| 36 | "ip_addr ess" => kn ife_search _for_ip("v ista-kodak ", stack, "aws") | |
| 37 | }, | |
| 38 | "vxsync" = > { | |
| 39 | "ip_addr ess" => kn ife_search _for_ip("v xsync", st ack, "aws" ) | |
| 40 | }, | |
| 41 | "pjds" => { | |
| 42 | "ip_addr ess" => kn ife_search _for_ip("p jds", stac k, "aws") | |
| 43 | }, | |
| 44 | "rdk" => { | |
| 45 | "ip_addr ess" => kn ife_search _for_ip("r dk", stack , "aws") | |
| 46 | }, | |
| 47 | "jbpm" => { | |
| 48 | "ip_addr ess" => kn ife_search _for_ip("j bpm", stac k, "aws") | |
| 49 | }, | |
| 50 | "cdsdb" => { | |
| 51 | "ip_addr ess" => kn ife_search _for_ip("c dsdb", sta ck, "aws") | |
| 52 | }, | |
| 53 | "cdsdashbo ard" => { | |
| 54 | "ip_addr ess" => kn ife_search _for_ip("c dsdashboar d", stack, "aws") | |
| 55 | }, | |
| 56 | "opencds" => { | |
| 57 | "ip_addr ess" => kn ife_search _for_ip("o pencds", s tack, "aws ") | |
| 58 | }, | |
| 59 | "cdsinvoca tion" => { | |
| 60 | "ip_addr ess" => kn ife_search _for_ip("c dsinvocati on", stack , "aws") | |
| 61 | }, | |
| 62 | "ehmp-ui" => { | |
| 63 | "ip_addr ess" => kn ife_search _for_ip("e hmp-ui", s tack, "aws ") | |
| 64 | }, | |
| 65 | "ehmp-bala ncer" => { | |
| 66 | "ip_addr ess" => kn ife_search _for_ip("e hmp-balanc er", stack , "aws") | |
| 67 | }, | |
| 68 | "cdsdashbo ard" => { | |
| 69 | "ip_addr ess" => kn ife_search _for_ip("c dsdashboar d", stack, "aws") | |
| 70 | }, | |
| 71 | "cdsdb" => { | |
| 72 | "ip_addr ess" => kn ife_search _for_ip("c dsdb", sta ck, "aws") | |
| 73 | }, | |
| 74 | "cdsinvoca tion" => { | |
| 75 | "ip_addr ess" => kn ife_search _for_ip("c dsinvocati on", stack , "aws") | |
| 76 | }, | |
| 77 | "opencds" => { | |
| 78 | "ip_addr ess" => kn ife_search _for_ip("o pencds", s tack, "aws ") | |
| 79 | } | |
| 80 | } | |
| 81 | end |
Araxis Merge (but not the data content of this report) is Copyright © 1993-2016 Araxis Ltd (www.araxis.com). All rights reserved.