Produced by Araxis Merge on 10/2/2017 1:40:11 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\third_party_cookbooks\rsyslog | .kitchen.busted.yml | Wed Jun 3 20:37:07 2015 UTC |
| 2 | chef-repo.zip\chef-repo\third_party_cookbooks\rsyslog | .kitchen.busted.yml | Mon Oct 2 12:50:52 2017 UTC |
| Description | Between Files 1 and 2 |
|
|---|---|---|
| Text Blocks | Lines | |
| Unchanged | 3 | 168 |
| Changed | 2 | 4 |
| 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 | driver_plu gin: vagra nt | |
| 3 | driver_plu gin: digit alocean | |
| 4 | driver_con fig: | |
| 5 | digitalo cean_clien t_id: <%= ENV['DIGIT AL_OCEAN_C LIENT_ID'] %> | |
| 6 | digitalo cean_api_k ey: <%= EN V['DIGITAL _OCEAN_API _KEY'] %> | |
| 7 | aws_acce ss_key_id: <%= ENV[' AWS_ACCESS _KEY_ID'] %> | |
| 8 | aws_secr et_access_ key: <%= E NV['AWS_SE CRET_ACCES S_KEY'] %> | |
| 9 | aws_ssh_ key_id: <% = ENV['AWS _KEYPAIR_N AME'] %> | |
| 10 | ssh_key: <%= ENV[' AWS_PRIVAT E_KEY_PATH '] %> | |
| 11 | rackspac e_username : <%= ENV[ 'RACKSPACE _USERNAME' ] %> | |
| 12 | rackspac e_api_key: <%= ENV[' RACKSPACE_ API_KEY'] %> | |
| 13 | require_ chef_omnib us: latest | |
| 14 | ||
| 15 | platforms: | |
| 16 | # - name: omnios-r15 1006c | |
| 17 | # driver _plugin: e c2 | |
| 18 | # driver _config: | |
| 19 | # imag e_id: ami- 35eb835c | |
| 20 | # user name: root | |
| 21 | ||
| 22 | - name: ce ntos-5.8 | |
| 23 | driver_p lugin: dig italocean | |
| 24 | driver_c onfig: | |
| 25 | image_ id: 1601 | |
| 26 | flavor _id: 63 | |
| 27 | region _id: 4 | |
| 28 | ssh_ke y_ids: <%= ENV['DIGI TAL_OCEAN_ SSH_KEY_ID S'] %> | |
| 29 | ||
| 30 | - name: ce ntos-6.4 | |
| 31 | driver_p lugin: dig italocean | |
| 32 | driver_c onfig: | |
| 33 | image_ id: 562354 | |
| 34 | flavor _id: 63 | |
| 35 | region _id: 4 | |
| 36 | ssh_ke y_ids: <%= ENV['DIGI TAL_OCEAN_ SSH_KEY_ID S'] %> | |
| 37 | ||
| 38 | # - name: amazon-201 3.09 | |
| 39 | # driver _plugin: e c2 | |
| 40 | # driver _config: | |
| 41 | # imag e_id: ami- 3be4bc52 | |
| 42 | # username: DNS | |
| 43 | ||
| 44 | - name: ub untu-1004 | |
| 45 | driver_p lugin: dig italocean | |
| 46 | driver_c onfig: | |
| 47 | image_ id: 14097 | |
| 48 | flavor _id: 63 | |
| 49 | region _id: 4 | |
| 50 | ssh_ke y_ids: <%= ENV['DIGI TAL_OCEAN_ SSH_KEY_ID S'] %> | |
| 51 | run_list : | |
| 52 | - recipe [apt] | |
| 53 | ||
| 54 | - name: ub untu-1204 | |
| 55 | driver_p lugin: dig italocean | |
| 56 | driver_c onfig: | |
| 57 | image_ id: 150544 7 | |
| 58 | flavor _id: 63 | |
| 59 | region _id: 4 | |
| 60 | ssh_ke y_ids: <%= ENV['DIGI TAL_OCEAN_ SSH_KEY_ID S'] %> | |
| 61 | run_list : | |
| 62 | - recipe [apt] | |
| 63 | ||
| 64 | suites: | |
| 65 | - name: default | |
| 66 | run_li st: | |
| 67 | - re cipe[rsysl og::defaul t] | |
| 68 | - name: relp | |
| 69 | run_li st: | |
| 70 | - re cipe[rsysl og::defaul t] | |
| 71 | attrib utes: | |
| 72 | rsys log: | |
| 73 | us e_relp: tr ue | |
| 74 | # Cent OS and Omn iOS do not support r elp | |
| 75 | exclud es: | |
| 76 | - ce ntos-5.8 | |
| 77 | - om nios-r1510 06c | |
| 78 | - name: client | |
| 79 | run_li st: | |
| 80 | - re cipe[rsysl og::client ] | |
| 81 | attrib utes: | |
| 82 | rsys log: | |
| 83 | server_ip: IP | |
| 84 | - name: server | |
| 85 | run_li st: | |
| 86 | - re cipe[rsysl og::server ] |
Araxis Merge (but not the data content of this report) is Copyright © 1993-2016 Araxis Ltd (www.araxis.com). All rights reserved.