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\ehmp_provision\recipes | cprs.rb | Mon May 8 19:59:52 2017 UTC |
| 2 | chef-repo.zip\chef-repo\machine_cookbooks\ehmp_provision\recipes | cprs.rb | Mon Oct 2 12:37:54 2017 UTC |
| Description | Between Files 1 and 2 |
|
|---|---|---|
| Text Blocks | Lines | |
| Unchanged | 2 | 140 |
| 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 | # Cookbook Name:: ma chine | |
| 3 | # Recipe:: cprs-loca l | |
| 4 | # | |
| 5 | ||
| 6 | require 'c hef/provis ioning/vag rant_drive r' | |
| 7 | require 'c hef/mixin/ shell_out' | |
| 8 | with_drive r 'vagrant ' | |
| 9 | ||
| 10 | windows_bo x = "windo ws7pro-bas e-2.7" | |
| 11 | windows_bo x_url = "# {node[:com mon][:nexu s_url]}/ne xus/conten t/reposito ries/filer epo/third- party/prog ram/vagran t/basebox/ windows7pr o-base/2.7 /windows7p ro-base-2. 7.box" | |
| 12 | box_timeou t = 3600 | |
| 13 | if `vagran t box list | grep #{ windows_bo x}` == "" | |
| 14 | puts "do wnload #{w indows_box } vagrant box... thi s may take a while" | |
| 15 | shell_ou t("vagrant box add # {windows_b ox} #{wind ows_box_ur l}", :time out => box _timeout) | |
| 16 | end | |
| 17 | ||
| 18 | # Provisio ning machi nes using WinRM is o nly suppor ted if dep loying aga inst a che f-sever | |
| 19 | # Local mo de does no t work | |
| 20 | with_chef_ server 'ht tps://pant ry.vistaco re.us/orga nizations/ vistacore' , | |
| 21 | :client_ name => Ch ef::Config [:node_nam e], | |
| 22 | :signing _key_filen ame => Che f::Config[ :client_ke y] | |
| 23 | ||
| 24 | machine_op ts = { | |
| 25 | :vagrant _options = > { | |
| 26 | 'vm.bo x' => "win dows7pro-b ase-2.7", | |
| 27 | 'vm.bo ot_timeout ' => 600, | |
| 28 | 'vm.gu est' => :w indows, | |
| 29 | 'vm.co mmunicator ' => "winr m", | |
| 30 | 'winrm .guest_por t' => 5985 , | |
| 31 | 'windo ws.set_wor k_network' => true, | |
| 32 | 'vm.ne twork' => { | |
| 33 | 'pri vate_netwo rk' => { | |
| 34 | :ip => " IP " | |
| 35 | }, | |
| 36 | :for warded_por t => { | |
| 37 | gu est: 5985, | |
| 38 | ho st: 5985, | |
| 39 | id : "winrm", | |
| 40 | au to_correct : true | |
| 41 | } | |
| 42 | }, | |
| 43 | 'vm.pr ovider' => { | |
| 44 | "vir tualbox" = > { | |
| 45 | :n ame => "cp rs-#{ENV[' USER'].tr( '.', '')}" , | |
| 46 | :g ui => true | |
| 47 | } | |
| 48 | } | |
| 49 | }, | |
| 50 | :converg ence_optio ns => { | |
| 51 | :insta ll_msi_url => "#{nod e[:common] [:nexus_ur l]}/nexus/ content/re positories /filerepo/ third-part y/program/ chef/chef- client/12. 3.0/chef-c lient-12.3 .0.msi" | |
| 52 | } | |
| 53 | } | |
| 54 | ||
| 55 | ehmp_deps = parse_de pendency_v ersions "e hmp_provis ion" | |
| 56 | ||
| 57 | r_list = [ ] | |
| 58 | r_list << "recipe[vi sta::clien t@#{ehmp_d eps["vista "]}]" | |
| 59 | ||
| 60 | machine "c prs-#{ENV[ 'USER'].tr ('.', '')} " do | |
| 61 | machine_ options ma chine_opts | |
| 62 | attribut es( | |
| 63 | stack: node[:mac hine][:sta ck], | |
| 64 | nexus_ url: node[ :common][: nexus_url] , | |
| 65 | data_b ag_string: node[:com mon][:data _bag_strin g] | |
| 66 | ) | |
| 67 | converge node[:mac hine][:con verge] | |
| 68 | run_list r_list | |
| 69 | chef_env ironment n ode[:machi ne][:envir onment] | |
| 70 | action n ode[:machi ne][:actio n] | |
| 71 | end |
Araxis Merge (but not the data content of this report) is Copyright © 1993-2016 Araxis Ltd (www.araxis.com). All rights reserved.