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\chef-repo_provision\recipes | yosemite-local.rb | Thu Mar 23 16:44:18 2017 UTC |
| 2 | chef-repo.zip\chef-repo\machine_cookbooks\chef-repo_provision\recipes | yosemite-local.rb | Mon Oct 2 12:37:43 2017 UTC |
| Description | Between Files 1 and 2 |
|
|---|---|---|
| Text Blocks | Lines | |
| Unchanged | 2 | 92 |
| 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:: wo rkstation | |
| 3 | # Recipe:: yosemite | |
| 4 | # | |
| 5 | ||
| 6 | require 'c hef/provis ioning/vag rant_drive r' | |
| 7 | with_drive r 'vagrant ' | |
| 8 | ||
| 9 | vagrant_bo x 'osx-10. 10.1' do | |
| 10 | url "#{n ode[:commo n][:nexus_ url]}/nexu s/content/ repositori es/filerep o/third-pa rty/progra m/vagrant/ basebox/os x/10.10.1/ osx-10.10. 1.box" | |
| 11 | end | |
| 12 | ||
| 13 | osx_opts = {} | |
| 14 | osx_opts[: box_name] = 'osx-10. 10.1' | |
| 15 | osx_opts[: network] = { | |
| 16 | :network _type => n ode[:machi ne][:netwo rk_type], | |
| 17 | :ip_addres s => " IP " | |
| 18 | } | |
| 19 | osx_opts[: provider_c onfig] = { | |
| 20 | :provide r_name => node[:mach ine][:prov ider_name] , | |
| 21 | :instanc e_name => "yosemite- #{node[:ma chine][:st ack]}", | |
| 22 | :memory => 2048, | |
| 23 | :gui => true, | |
| 24 | :is_osx => true | |
| 25 | } | |
| 26 | osx_opts[: synced_fol ders] = [ | |
| 27 | { | |
| 28 | :host_ path => ". ", | |
| 29 | :guest _path => " /vagrant", | |
| 30 | :disab led => tru e | |
| 31 | } | |
| 32 | ] | |
| 33 | ||
| 34 | machine "y osemite-#{ node[:mach ine][:stac k]}" do | |
| 35 | machine_ options[:v agrant_con fig] = vag rant_confi g(osx_opts ) | |
| 36 | converge node[:mac hine][:con verge] | |
| 37 | file nod e[:machine ][:cert_fi le][:guest _path], no de[:machin e][:cert_f ile][:host _path] | |
| 38 | file "/U sers/vagra nt/Project s/vistacor e/.chef/kn ife.rb", " #{ENV['HOM E']}/Proje cts/vistac ore/.chef/ knife.rb" | |
| 39 | chef_env ironment n ode[:machi ne][:envir onment] | |
| 40 | attribut es( | |
| 41 | stack: node[:mac hine][:sta ck], | |
| 42 | nexus_ url: node[ :common][: nexus_url] , | |
| 43 | data_b ag_string: node[:com mon][:data _bag_strin g] | |
| 44 | ) | |
| 45 | role 'wo rkstation' | |
| 46 | action n ode[:machi ne][:actio n] | |
| 47 | end |
Araxis Merge (but not the data content of this report) is Copyright © 1993-2016 Araxis Ltd (www.araxis.com). All rights reserved.