166. EPMO Open Source Coordination Office Redaction File Detail Report

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.

166.1 Files compared

# Location File Last Modified
1 chef-repo.zip\chef-repo\third_party_cookbooks\rsyslog .kitchen.cloud.yml Wed Jun 3 20:37:07 2015 UTC
2 chef-repo.zip\chef-repo\third_party_cookbooks\rsyslog .kitchen.cloud.yml Mon Oct 2 12:50:53 2017 UTC

166.2 Comparison summary

Description Between
Files 1 and 2
Text Blocks Lines
Unchanged 3 180
Changed 2 4
Inserted 0 0
Removed 0 0

166.3 Comparison options

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

166.4 Active regular expressions

No regular expressions were active.

166.5 Comparison detail

  1   ---
  2   driver_con fig:
  3     digitalo cean_clien t_id: <%=  ENV['DIGIT AL_OCEAN_C LIENT_ID']  %>
  4     digitalo cean_api_k ey: <%= EN V['DIGITAL _OCEAN_API _KEY'] %>
  5     aws_acce ss_key_id:  <%= ENV[' AWS_ACCESS _KEY_ID']  %> 
  6     aws_secr et_access_ key: <%= E NV['AWS_SE CRET_ACCES S_KEY'] %>
  7     aws_ssh_ key_id: <% = ENV['AWS _KEYPAIR_N AME'] %>
  8  
  9   provisione r:
  10     name: ch ef_zero
  11     require_ chef_omnib us: latest
  12  
  13   platforms:
  14   - name: ce ntos-5.8
  15     driver_p lugin: dig italocean
  16     driver_c onfig:
  17       image_ id: 1601
  18       flavor _id: 63
  19       region _id: 4
  20       ssh_ke y_ids: <%=  ENV['DIGI TAL_OCEAN_ SSH_KEY_ID S'] %>
  21       ssh_ke y: <%= ENV ['DIGITAL_ OCEAN_SSH_ KEY_PATH']  %>
  22  
  23   - name: ce ntos-6.4
  24     driver_p lugin: dig italocean
  25     driver_c onfig:
  26       image_ id: 562354
  27       flavor _id: 63
  28       region _id: 4
  29       ssh_ke y_ids: <%=  ENV['DIGI TAL_OCEAN_ SSH_KEY_ID S'] %>
  30       ssh_ke y: <%= ENV ['DIGITAL_ OCEAN_SSH_ KEY_PATH']  %>
  31  
  32   # - name:  amazon-201 3.09
  33   #   driver _plugin: e c2
  34   #   driver _config:
  35   #     imag e_id: ami- 3be4bc52
  36        username:  DNS      
  37   #     ssh_ key: <%= E NV['EC2_SS H_KEY_PATH '] %>
  38  
  39   - name: fe dora-19
  40     driver_p lugin: dig italocean
  41     driver_c onfig:
  42       image_ id: 696598
  43       flavor _id: 63
  44       region _id: 4
  45       ssh_ke y_ids: <%=  ENV['DIGI TAL_OCEAN_ SSH_KEY_ID S'] %>
  46       ssh_ke y: <%= ENV ['DIGITAL_ OCEAN_SSH_ KEY_PATH']  %>
  47  
  48   - name: ub untu-1004
  49     driver_p lugin: dig italocean
  50     driver_c onfig:
  51       image_ id: 14097
  52       flavor _id: 63
  53       region _id: 4
  54       ssh_ke y_ids: <%=  ENV['DIGI TAL_OCEAN_ SSH_KEY_ID S'] %>
  55       ssh_ke y: <%= ENV ['DIGITAL_ OCEAN_SSH_ KEY_PATH']  %>
  56     run_list :
  57     - recipe [apt]
  58  
  59   - name: ub untu-1204
  60     driver_p lugin: dig italocean
  61     driver_c onfig:
  62       image_ id: 150544 7
  63       flavor _id: 63
  64       region _id: 4
  65       ssh_ke y_ids: <%=  ENV['DIGI TAL_OCEAN_ SSH_KEY_ID S'] %>
  66       ssh_ke y: <%= ENV ['DIGITAL_ OCEAN_SSH_ KEY_PATH']  %>
  67     run_list :
  68     - recipe [apt]
  69  
  70   suites:
  71     - name:  default
  72       run_li st:
  73         - re cipe[rsysl og::defaul t]
  74     - name:  relp
  75       run_li st:
  76         - re cipe[rsysl og::defaul t]
  77       attrib utes:
  78         rsys log:
  79           us e_relp: tr ue
  80       # Cent OS and Omn iOS do not  support r elp
  81       exclud es:
  82         - ce ntos-5.8
  83         - om nios-r1510 06c
  84     - name:  client
  85       run_li st:
  86         - re cipe[rsysl og::client ]
  87       attrib utes:
  88         rsys log:
  89             server_ip:   IP        
  90     - name:  server
  91       run_li st:
  92         - re cipe[rsysl og::server ]