Left: | ||
Right: |
OLD | NEW |
---|---|
1 --- | 1 --- |
2 adblockplus::hosts: | 2 adblockplus::hosts: |
3 absent-example: | 3 absent-example: |
4 ensure: "absent" | 4 ensure: "absent" |
5 jessie0: | 5 jessie0: |
6 ips: [10.8.0.101] | 6 ips: [10.8.0.101] |
7 os: "debian-jessie" | 7 os: "debian-jessie" |
8 public_key: &vagrant_box_jessie | 8 public_key: &vagrant_box_jessie |
9 "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDkXTOj2JwvwlDaHbaMrDuosuRuU5ZuKe1EH NJa67ZxkB1a6Y1ObDxfYiYnvI5i9sQyUmmc5TrGAGGJs1BrriMaPayBaTSf3ymU2Rqxj3GZXuiioCxGV 8I2R/aOhwvpbnVqZH5O99IuAZbrag5J/WhDWgWuk3gFrZxEwQmZW144tJH//I3b0oMAr3/arBViVeU52 dHhKX9xdStTzFpWKUav/NoKKrgB91QKwPx8U6ymuDoCQU7qyTBnAX1sYuSwEMJzVRqtmKLybR4Xp5A94 EMbJsgVbq4LrUrMo00FdLV0EGMmA2Kmd/9D+CuZXoD6/mWkzmaVfiUMKhrorM05voFp vagrant@cont rib-jessie" | 9 "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDkXTOj2JwvwlDaHbaMrDuosuRuU5ZuKe1EH NJa67ZxkB1a6Y1ObDxfYiYnvI5i9sQyUmmc5TrGAGGJs1BrriMaPayBaTSf3ymU2Rqxj3GZXuiioCxGV 8I2R/aOhwvpbnVqZH5O99IuAZbrag5J/WhDWgWuk3gFrZxEwQmZW144tJH//I3b0oMAr3/arBViVeU52 dHhKX9xdStTzFpWKUav/NoKKrgB91QKwPx8U6ymuDoCQU7qyTBnAX1sYuSwEMJzVRqtmKLybR4Xp5A94 EMbJsgVbq4LrUrMo00FdLV0EGMmA2Kmd/9D+CuZXoD6/mWkzmaVfiUMKhrorM05voFp vagrant@cont rib-jessie" |
10 precise0: | 10 precise0: |
11 ips: [10.8.0.102] | 11 ips: [10.8.0.102] |
12 os: "ubuntu-precise" | 12 os: "ubuntu-precise" |
13 public_key: &vagrant_box_precise | 13 public_key: &vagrant_box_precise |
14 "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDkXTOj2JwvwlDaHbaMrDuosuRuU5ZuKe1EH NJa67ZxkB1a6Y1ObDxfYiYnvI5i9sQyUmmc5TrGAGGJs1BrriMaPayBaTSf3ymU2Rqxj3GZXuiioCxGV 8I2R/aOhwvpbnVqZH5O99IuAZbrag5J/WhDWgWuk3gFrZxEwQmZW144tJH//I3b0oMAr3/arBViVeU52 dHhKX9xdStTzFpWKUav/NoKKrgB91QKwPx8U6ymuDoCQU7qyTBnAX1sYuSwEMJzVRqtmKLybR4Xp5A94 EMbJsgVbq4LrUrMo00FdLV0EGMmA2Kmd/9D+CuZXoD6/mWkzmaVfiUMKhrorM05voFp vagrant@prec ise64" | 14 "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDkXTOj2JwvwlDaHbaMrDuosuRuU5ZuKe1EH NJa67ZxkB1a6Y1ObDxfYiYnvI5i9sQyUmmc5TrGAGGJs1BrriMaPayBaTSf3ymU2Rqxj3GZXuiioCxGV 8I2R/aOhwvpbnVqZH5O99IuAZbrag5J/WhDWgWuk3gFrZxEwQmZW144tJH//I3b0oMAr3/arBViVeU52 dHhKX9xdStTzFpWKUav/NoKKrgB91QKwPx8U6ymuDoCQU7qyTBnAX1sYuSwEMJzVRqtmKLybR4Xp5A94 EMbJsgVbq4LrUrMo00FdLV0EGMmA2Kmd/9D+CuZXoD6/mWkzmaVfiUMKhrorM05voFp vagrant@prec ise64" |
15 puppetmaster0: | 15 puppetmaster0: |
16 ips: [10.8.0.100] | 16 ips: [10.8.0.100] |
17 os: "debian-jessie" | 17 os: "debian-jessie" |
18 public_key: *vagrant_box_jessie | 18 public_key: *vagrant_box_jessie |
19 role: "puppetmaster" | 19 role: "puppetmaster" |
20 filter1: | 20 filter1: |
21 ips: [10.8.0.120] | 21 ips: [10.8.0.120] |
22 os: "debian-jessie" | |
23 public_key: *vagrant_box_jessie | |
22 role: filterserver | 24 role: filterserver |
23 groups: [filter-servers] | 25 groups: [filter-servers] |
24 server4: | 26 server4: |
25 ips: [10.8.0.99] | 27 ips: [10.8.0.99] |
26 role: monitoringserver | 28 role: monitoringserver |
27 public_key: *vagrant_box_precise | 29 os: "debian-jessie" |
30 public_key: *vagrant_box_jessie | |
28 groups: [http-servers] | 31 groups: [http-servers] |
29 codereview1: | 32 codereview1: |
30 ips: [10.8.0.132] | 33 ips: [10.8.0.132] |
31 role: codereviewserver | 34 role: codereviewserver |
32 public_key: *vagrant_box_precise | 35 public_key: *vagrant_box_precise |
33 groups: [http-servers] | 36 groups: [http-servers] |
34 download1: | 37 download1: |
35 ips: [10.8.0.126] | 38 ips: [10.8.0.126] |
36 role: downloadserver | 39 role: downloadserver |
37 public_key: *vagrant_box_precise | 40 os: "debian-jessie" |
41 public_key: *vagrant_box_jessie | |
38 groups: [http-servers] | 42 groups: [http-servers] |
39 filtermaster1: | 43 filtermaster1: |
40 ips: [10.8.0.127] | 44 ips: [10.8.0.127] |
41 role: filtermasterserver | 45 role: filtermasterserver |
42 public_key: *vagrant_box_precise | 46 os: "debian-jessie" |
47 public_key: *vagrant_box_jessie | |
43 server10: | 48 server10: |
44 ips: [10.8.0.105] | 49 ips: [10.8.0.105] |
45 role: intraforumserver | 50 role: intraforumserver |
46 public_key: *vagrant_box_precise | 51 public_key: *vagrant_box_precise |
47 groups: [http-servers] | 52 groups: [http-servers] |
53 forum1: | |
54 ips: [10.8.0.106] | |
55 role: communityforumserver | |
56 os: "debian-jessie" | |
57 public_key: *vagrant_box_jessie | |
58 groups: [http-servers] | |
f.nicolaisen
2017/01/03 16:02:23
This entry should be removed until we have a patch
f.lopez
2017/01/03 16:45:57
Acknowledged.
| |
48 issues1: | 59 issues1: |
49 ips: [10.8.0.131] | 60 ips: [10.8.0.131] |
50 public_key: *vagrant_box_precise | 61 os: "debian-jessie" |
62 public_key: *vagrant_box_jessie | |
51 groups: [http-servers] | 63 groups: [http-servers] |
52 stats1: | 64 stats1: |
53 ips: [10.8.0.130] | 65 ips: [10.8.0.130] |
54 role: statsmaster | 66 role: statsmaster |
55 public_key: *vagrant_box_precise | 67 os: "debian-jessie" |
68 public_key: *vagrant_box_jessie | |
56 groups: [http-servers] | 69 groups: [http-servers] |
57 update1: | 70 update1: |
58 ips: [10.8.0.128] | 71 ips: [10.8.0.128] |
59 role: updateserver | 72 role: updateserver |
60 public_key: *vagrant_box_precise | 73 os: "debian-jessie" |
74 public_key: *vagrant_box_jessie | |
61 groups: [http-servers] | 75 groups: [http-servers] |
62 web1: | 76 web1: |
63 ips: [10.8.0.129] | 77 ips: [10.8.0.129] |
64 role: web/eyeo | 78 role: web/eyeo |
65 public_key: *vagrant_box_precise | 79 os: "debian-jessie" |
80 public_key: *vagrant_box_jessie | |
66 groups: [http-servers] | 81 groups: [http-servers] |
67 web2: | 82 web2: |
68 ips: [10.8.0.145] | 83 ips: [10.8.0.145] |
69 public_key: *vagrant_box_precise | 84 os: "debian-jessie" |
85 public_key: *vagrant_box_jessie | |
70 groups: [http-servers] | 86 groups: [http-servers] |
71 web3: | 87 web3: |
72 ips: [10.8.0.146] | 88 ips: [10.8.0.146] |
73 role: web/testpages | 89 role: web/testpages |
74 public_key: *vagrant_box_precise | 90 os: "debian-jessie" |
91 public_key: *vagrant_box_jessie | |
75 groups: [http-servers] | 92 groups: [http-servers] |
76 web-sh-abp-org-1: | 93 web-sh-abp-org-1: |
77 ips: [10.8.0.147] | 94 ips: [10.8.0.147] |
78 role: web/share | 95 role: web/share |
79 public_key: *vagrant_box_precise | 96 os: "debian-jessie" |
97 public_key: *vagrant_box_jessie | |
80 groups: [http-servers] | 98 groups: [http-servers] |
81 web-yt-abp-me-1: | 99 web-yt-abp-me-1: |
82 ips: [10.8.0.148] | 100 ips: [10.8.0.148] |
83 role: web/youtube | 101 role: web/youtube |
84 public_key: *vagrant_box_precise | 102 os: "debian-jessie" |
103 public_key: *vagrant_box_jessie | |
85 groups: [http-servers] | 104 groups: [http-servers] |
86 web-fb-abp-me-1: | 105 web-fb-abp-me-1: |
87 ips: [10.8.0.149] | 106 ips: [10.8.0.149] |
88 role: web/facebook | 107 role: web/facebook |
89 public_key: *vagrant_box_precise | 108 os: "debian-jessie" |
109 public_key: *vagrant_box_jessie | |
90 groups: [http-servers] | 110 groups: [http-servers] |
91 web-aa-com-1: | 111 web-aa-com-1: |
92 ips: [10.8.0.150] | 112 ips: [10.8.0.150] |
93 role: web/acceptableads | 113 role: web/acceptableads |
94 public_key: *vagrant_box_precise | 114 os: "debian-jessie" |
115 public_key: *vagrant_box_jessie | |
95 groups: [http-servers] | 116 groups: [http-servers] |
96 hg1: | 117 hg1: |
97 ips: [10.8.0.152] | 118 ips: [10.8.0.152] |
98 role: hgwebserver | 119 role: hgwebserver |
99 public_key: *vagrant_box_precise | 120 os: "debian-jessie" |
121 public_key: *vagrant_box_jessie | |
100 groups: [http-servers] | 122 groups: [http-servers] |
101 build1: | 123 build1: |
102 ips: [10.8.0.153] | 124 ips: [10.8.0.153] |
103 role: buildmasterserver | 125 role: buildmasterserver |
104 public_key: *vagrant_box_precise | 126 os: "debian-jessie" |
127 public_key: *vagrant_box_jessie | |
105 groups: [http-servers] | 128 groups: [http-servers] |
106 web-abb-org-1: | 129 web-abb-org-1: |
107 ips: [10.8.0.154] | 130 ips: [10.8.0.154] |
108 role: web/adblockbrowser | 131 role: web/adblockbrowser |
109 public_key: *vagrant_box_precise | 132 os: "debian-jessie" |
133 public_key: *vagrant_box_jessie | |
110 groups: [http-servers] | 134 groups: [http-servers] |
111 web-subscribe-abp-org-1: | 135 web-subscribe-abp-org-1: |
112 ips: [10.8.0.155] | 136 ips: [10.8.0.155] |
113 role: web/subscribe | 137 role: web/subscribe |
114 public_key: *vagrant_box_precise | 138 os: "debian-jessie" |
139 public_key: *vagrant_box_jessie | |
115 groups: [http-servers] | 140 groups: [http-servers] |
116 web-easylist-abp-org-1: | 141 web-easylist-abp-org-1: |
117 ips: [10.8.0.156] | 142 ips: [10.8.0.156] |
118 role: web/easylist | 143 role: web/easylist |
119 public_key: *vagrant_box_precise | 144 os: "debian-jessie" |
145 public_key: *vagrant_box_jessie | |
120 groups: [http-servers] | 146 groups: [http-servers] |
121 log1: | 147 log1: |
122 ips: [10.8.0.210] | 148 ips: [10.8.0.210] |
123 role: logserver | 149 role: logserver |
124 public_key: *vagrant_box_precise | 150 os: "debian-jessie" |
151 public_key: *vagrant_box_jessie | |
125 logprocessor1: | 152 logprocessor1: |
126 ips: [10.8.0.211] | 153 ips: [10.8.0.211] |
127 role: logprocessor | 154 role: logprocessor |
128 public_key: *vagrant_box_precise | 155 os: "debian-jessie" |
156 public_key: *vagrant_box_jessie | |
129 telemetry1: | 157 telemetry1: |
130 ips: [10.8.0.220] | 158 ips: [10.8.0.220] |
131 role: telemetryserver | 159 role: telemetryserver |
132 public_key: *vagrant_box_precise | 160 os: "debian-jessie" |
161 public_key: *vagrant_box_jessie | |
133 groups: [http-servers] | 162 groups: [http-servers] |
134 | 163 |
OLD | NEW |