Merge lp:~tvansteenburgh/charms/precise/hacluster/fix-tests into lp:charms/hacluster
- Precise Pangolin (12.04)
- fix-tests
- Merge into trunk
Proposed by
Tim Van Steenburgh
Status: | Needs review |
---|---|
Proposed branch: | lp:~tvansteenburgh/charms/precise/hacluster/fix-tests |
Merge into: | lp:charms/hacluster |
Diff against target: |
360 lines (+298/-5) 5 files modified
Makefile (+0/-4) config.yaml (+3/-0) hooks/hooks.py (+1/-1) icon.svg (+292/-0) metadata.yaml (+2/-0) |
To merge this branch: | bzr merge lp:~tvansteenburgh/charms/precise/hacluster/fix-tests |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
charmers | Pending | ||
Review via email: mp+234201@code.launchpad.net |
Commit message
Description of the change
Fix proof, lint. Remove unused test target.
To post a comment you must log in.
Unmerged revisions
- 24. By Tim Van Steenburgh
-
Fix proof, lint. Remove unused test target.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1 | === modified file 'Makefile' |
2 | --- Makefile 2014-04-11 09:57:50 +0000 |
3 | +++ Makefile 2014-09-10 19:59:58 +0000 |
4 | @@ -5,9 +5,5 @@ |
5 | @flake8 --exclude hooks/charmhelpers hooks |
6 | @charm proof |
7 | |
8 | -test: |
9 | - @echo Starting tests... |
10 | - @$(PYTHON) /usr/bin/nosetests --nologcapture --with-coverage unit_tests |
11 | - |
12 | sync: |
13 | @charm-helper-sync -c charm-helpers.yaml |
14 | |
15 | === modified file 'config.yaml' |
16 | --- config.yaml 2014-01-29 20:48:59 +0000 |
17 | +++ config.yaml 2014-09-10 19:59:58 +0000 |
18 | @@ -33,9 +33,11 @@ |
19 | parameters are properly configured in its invenvory. |
20 | maas_url: |
21 | type: string |
22 | + default: |
23 | description: MAAS API endpoint (required for STONITH). |
24 | maas_credentials: |
25 | type: string |
26 | + default: |
27 | description: MAAS credentials (required for STONITH). |
28 | cluster_count: |
29 | type: int |
30 | @@ -43,6 +45,7 @@ |
31 | description: Number of peer units required to bootstrap cluster services. |
32 | monitor_host: |
33 | type: string |
34 | + default: |
35 | description: | |
36 | One or more IPs, separated by space, that will be used as a saftey check |
37 | for avoiding split brain situations. Nodes in the cluster will ping these |
38 | |
39 | === modified file 'hooks/hooks.py' |
40 | --- hooks/hooks.py 2014-04-11 10:14:56 +0000 |
41 | +++ hooks/hooks.py 2014-09-10 19:59:58 +0000 |
42 | @@ -260,7 +260,7 @@ |
43 | # Put the services in HA, if not already done so |
44 | # if not pcmk.is_resource_present(res_name): |
45 | if not pcmk.crm_opt_exists(res_name): |
46 | - if not res_name in resource_params: |
47 | + if res_name not in resource_params: |
48 | cmd = 'crm -w -F configure primitive %s %s' % (res_name, |
49 | res_type) |
50 | else: |
51 | |
52 | === added file 'icon.svg' |
53 | --- icon.svg 1970-01-01 00:00:00 +0000 |
54 | +++ icon.svg 2014-09-10 19:59:58 +0000 |
55 | @@ -0,0 +1,292 @@ |
56 | +<?xml version="1.0" encoding="UTF-8" standalone="no"?> |
57 | +<!-- Created with Inkscape (http://www.inkscape.org/) --> |
58 | + |
59 | +<svg |
60 | + xmlns:dc="http://purl.org/dc/elements/1.1/" |
61 | + xmlns:cc="http://creativecommons.org/ns#" |
62 | + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" |
63 | + xmlns:svg="http://www.w3.org/2000/svg" |
64 | + xmlns="http://www.w3.org/2000/svg" |
65 | + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" |
66 | + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" |
67 | + width="96" |
68 | + height="96" |
69 | + id="svg6517" |
70 | + version="1.1" |
71 | + inkscape:version="0.48.4 r9939" |
72 | + sodipodi:docname="juju-icon-placeholder-h.svg"> |
73 | + <defs |
74 | + id="defs6519"> |
75 | + <linearGradient |
76 | + id="Background"> |
77 | + <stop |
78 | + id="stop4178" |
79 | + offset="0" |
80 | + style="stop-color:#b8b8b8;stop-opacity:1" /> |
81 | + <stop |
82 | + id="stop4180" |
83 | + offset="1" |
84 | + style="stop-color:#c9c9c9;stop-opacity:1" /> |
85 | + </linearGradient> |
86 | + <filter |
87 | + style="color-interpolation-filters:sRGB;" |
88 | + inkscape:label="Inner Shadow" |
89 | + id="filter1121"> |
90 | + <feFlood |
91 | + flood-opacity="0.59999999999999998" |
92 | + flood-color="rgb(0,0,0)" |
93 | + result="flood" |
94 | + id="feFlood1123" /> |
95 | + <feComposite |
96 | + in="flood" |
97 | + in2="SourceGraphic" |
98 | + operator="out" |
99 | + result="composite1" |
100 | + id="feComposite1125" /> |
101 | + <feGaussianBlur |
102 | + in="composite1" |
103 | + stdDeviation="1" |
104 | + result="blur" |
105 | + id="feGaussianBlur1127" /> |
106 | + <feOffset |
107 | + dx="0" |
108 | + dy="2" |
109 | + result="offset" |
110 | + id="feOffset1129" /> |
111 | + <feComposite |
112 | + in="offset" |
113 | + in2="SourceGraphic" |
114 | + operator="atop" |
115 | + result="composite2" |
116 | + id="feComposite1131" /> |
117 | + </filter> |
118 | + <filter |
119 | + style="color-interpolation-filters:sRGB;" |
120 | + inkscape:label="Drop Shadow" |
121 | + id="filter950"> |
122 | + <feFlood |
123 | + flood-opacity="0.25" |
124 | + flood-color="rgb(0,0,0)" |
125 | + result="flood" |
126 | + id="feFlood952" /> |
127 | + <feComposite |
128 | + in="flood" |
129 | + in2="SourceGraphic" |
130 | + operator="in" |
131 | + result="composite1" |
132 | + id="feComposite954" /> |
133 | + <feGaussianBlur |
134 | + in="composite1" |
135 | + stdDeviation="1" |
136 | + result="blur" |
137 | + id="feGaussianBlur956" /> |
138 | + <feOffset |
139 | + dx="0" |
140 | + dy="1" |
141 | + result="offset" |
142 | + id="feOffset958" /> |
143 | + <feComposite |
144 | + in="SourceGraphic" |
145 | + in2="offset" |
146 | + operator="over" |
147 | + result="composite2" |
148 | + id="feComposite960" /> |
149 | + <feBlend |
150 | + blend="normal" |
151 | + id="feBlend3895" |
152 | + in2="composite2" /> |
153 | + </filter> |
154 | + <clipPath |
155 | + clipPathUnits="userSpaceOnUse" |
156 | + id="clipPath873"> |
157 | + <g |
158 | + transform="matrix(0,-0.66666667,0.66604479,0,-258.25992,677.00001)" |
159 | + id="g875" |
160 | + inkscape:label="Layer 1" |
161 | + style="fill:#ff00ff;fill-opacity:1;stroke:none;display:inline"> |
162 | + <path |
163 | + style="fill:#ff00ff;fill-opacity:1;stroke:none;display:inline" |
164 | + d="m 46.702703,898.22775 50.594594,0 C 138.16216,898.22775 144,904.06497 144,944.92583 l 0,50.73846 c 0,40.86071 -5.83784,46.69791 -46.702703,46.69791 l -50.594594,0 C 5.8378378,1042.3622 0,1036.525 0,995.66429 L 0,944.92583 C 0,904.06497 5.8378378,898.22775 46.702703,898.22775 Z" |
165 | + id="path877" |
166 | + inkscape:connector-curvature="0" |
167 | + sodipodi:nodetypes="sssssssss" /> |
168 | + </g> |
169 | + </clipPath> |
170 | + <filter |
171 | + inkscape:collect="always" |
172 | + id="filter891" |
173 | + inkscape:label="Badge Shadow"> |
174 | + <feGaussianBlur |
175 | + inkscape:collect="always" |
176 | + stdDeviation="0.71999962" |
177 | + id="feGaussianBlur893" /> |
178 | + </filter> |
179 | + </defs> |
180 | + <sodipodi:namedview |
181 | + id="base" |
182 | + pagecolor="#ffffff" |
183 | + bordercolor="#666666" |
184 | + borderopacity="1.0" |
185 | + inkscape:pageopacity="0.0" |
186 | + inkscape:pageshadow="2" |
187 | + inkscape:zoom="8.1490724" |
188 | + inkscape:cx="6.3116087" |
189 | + inkscape:cy="46.975739" |
190 | + inkscape:document-units="px" |
191 | + inkscape:current-layer="layer3" |
192 | + showgrid="true" |
193 | + fit-margin-top="0" |
194 | + fit-margin-left="0" |
195 | + fit-margin-right="0" |
196 | + fit-margin-bottom="0" |
197 | + inkscape:window-width="1849" |
198 | + inkscape:window-height="1218" |
199 | + inkscape:window-x="123" |
200 | + inkscape:window-y="68" |
201 | + inkscape:window-maximized="0" |
202 | + showborder="true" |
203 | + showguides="true" |
204 | + inkscape:guide-bbox="true" |
205 | + inkscape:showpageshadow="false"> |
206 | + <inkscape:grid |
207 | + type="xygrid" |
208 | + id="grid821" /> |
209 | + <sodipodi:guide |
210 | + orientation="1,0" |
211 | + position="16,48" |
212 | + id="guide823" /> |
213 | + <sodipodi:guide |
214 | + orientation="0,1" |
215 | + position="64,80" |
216 | + id="guide825" /> |
217 | + <sodipodi:guide |
218 | + orientation="1,0" |
219 | + position="80,40" |
220 | + id="guide827" /> |
221 | + <sodipodi:guide |
222 | + orientation="0,1" |
223 | + position="64,16" |
224 | + id="guide829" /> |
225 | + </sodipodi:namedview> |
226 | + <metadata |
227 | + id="metadata6522"> |
228 | + <rdf:RDF> |
229 | + <cc:Work |
230 | + rdf:about=""> |
231 | + <dc:format>image/svg+xml</dc:format> |
232 | + <dc:type |
233 | + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> |
234 | + <dc:title /> |
235 | + </cc:Work> |
236 | + </rdf:RDF> |
237 | + </metadata> |
238 | + <g |
239 | + inkscape:label="BACKGROUND" |
240 | + inkscape:groupmode="layer" |
241 | + id="layer1" |
242 | + transform="translate(268,-635.29076)" |
243 | + style="display:inline"> |
244 | + <path |
245 | + style="fill:#333333;fill-opacity:0.93333334000000001;stroke:none;display:inline;filter:url(#filter1121);opacity:0.7" |
246 | + d="m -268,700.15563 0,-33.72973 c 0,-27.24324 3.88785,-31.13513 31.10302,-31.13513 l 33.79408,0 c 27.21507,0 31.1029,3.89189 31.1029,31.13513 l 0,33.72973 c 0,27.24325 -3.88783,31.13514 -31.1029,31.13514 l -33.79408,0 C -264.11215,731.29077 -268,727.39888 -268,700.15563 Z" |
247 | + id="path6455" |
248 | + inkscape:connector-curvature="0" |
249 | + sodipodi:nodetypes="sssssssss" /> |
250 | + </g> |
251 | + <g |
252 | + inkscape:groupmode="layer" |
253 | + id="layer3" |
254 | + inkscape:label="PLACEHOLDER LETTER" |
255 | + style="display:inline"> |
256 | + <text |
257 | + xml:space="preserve" |
258 | + style="font-size:40px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;filter:url(#filter950);font-family:Sans" |
259 | + x="31.452" |
260 | + y="69.1772" |
261 | + id="text3891" |
262 | + sodipodi:linespacing="125%"><tspan |
263 | + sodipodi:role="line" |
264 | + id="tspan3893" |
265 | + x="31.452" |
266 | + y="69.1772" |
267 | + style="font-size:56px;font-style:normal;font-variant:normal;font-weight:500;font-stretch:normal;fill:#ffffff;fill-opacity:1;font-family:Ubuntu;-inkscape-font-specification:Ubuntu Medium">h</tspan></text> |
268 | + <rect |
269 | + style="opacity:0.7;fill:none;stroke:none" |
270 | + id="rect3021" |
271 | + width="64" |
272 | + height="64" |
273 | + x="16" |
274 | + y="15.449201" /> |
275 | + </g> |
276 | + <g |
277 | + inkscape:groupmode="layer" |
278 | + id="layer2" |
279 | + inkscape:label="BADGE" |
280 | + style="display:none" |
281 | + sodipodi:insensitive="true"> |
282 | + <g |
283 | + style="display:inline" |
284 | + transform="translate(-340.00001,-581)" |
285 | + id="g4394" |
286 | + clip-path="none"> |
287 | + <g |
288 | + id="g855"> |
289 | + <g |
290 | + inkscape:groupmode="maskhelper" |
291 | + id="g870" |
292 | + clip-path="url(#clipPath873)" |
293 | + style="opacity:0.6;filter:url(#filter891)"> |
294 | + <path |
295 | + transform="matrix(1.4999992,0,0,1.4999992,-29.999795,-237.54282)" |
296 | + d="m 264,552.36218 c 0,6.62742 -5.37258,12 -12,12 -6.62742,0 -12,-5.37258 -12,-12 0,-6.62741 5.37258,-12 12,-12 6.62742,0 12,5.37259 12,12 z" |
297 | + sodipodi:ry="12" |
298 | + sodipodi:rx="12" |
299 | + sodipodi:cy="552.36218" |
300 | + sodipodi:cx="252" |
301 | + id="path844" |
302 | + style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" |
303 | + sodipodi:type="arc" /> |
304 | + </g> |
305 | + <g |
306 | + id="g862"> |
307 | + <path |
308 | + sodipodi:type="arc" |
309 | + style="color:#000000;fill:#f5f5f5;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" |
310 | + id="path4398" |
311 | + sodipodi:cx="252" |
312 | + sodipodi:cy="552.36218" |
313 | + sodipodi:rx="12" |
314 | + sodipodi:ry="12" |
315 | + d="m 264,552.36218 c 0,6.62742 -5.37258,12 -12,12 -6.62742,0 -12,-5.37258 -12,-12 0,-6.62741 5.37258,-12 12,-12 6.62742,0 12,5.37259 12,12 z" |
316 | + transform="matrix(1.4999992,0,0,1.4999992,-29.999795,-238.54282)" /> |
317 | + <path |
318 | + transform="matrix(1.25,0,0,1.25,33,-100.45273)" |
319 | + d="m 264,552.36218 c 0,6.62742 -5.37258,12 -12,12 -6.62742,0 -12,-5.37258 -12,-12 0,-6.62741 5.37258,-12 12,-12 6.62742,0 12,5.37259 12,12 z" |
320 | + sodipodi:ry="12" |
321 | + sodipodi:rx="12" |
322 | + sodipodi:cy="552.36218" |
323 | + sodipodi:cx="252" |
324 | + id="path4400" |
325 | + style="color:#000000;fill:#dd4814;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" |
326 | + sodipodi:type="arc" /> |
327 | + <path |
328 | + sodipodi:type="star" |
329 | + style="color:#000000;fill:#f5f5f5;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" |
330 | + id="path4459" |
331 | + sodipodi:sides="5" |
332 | + sodipodi:cx="666.19574" |
333 | + sodipodi:cy="589.50385" |
334 | + sodipodi:r1="7.2431178" |
335 | + sodipodi:r2="4.3458705" |
336 | + sodipodi:arg1="1.0471976" |
337 | + sodipodi:arg2="1.6755161" |
338 | + inkscape:flatsided="false" |
339 | + inkscape:rounded="0.1" |
340 | + inkscape:randomized="0" |
341 | + d="m 669.8173,595.77657 c -0.39132,0.22593 -3.62645,-1.90343 -4.07583,-1.95066 -0.44938,-0.0472 -4.05653,1.36297 -4.39232,1.06062 -0.3358,-0.30235 0.68963,-4.03715 0.59569,-4.47913 -0.0939,-0.44198 -2.5498,-3.43681 -2.36602,-3.8496 0.18379,-0.41279 4.05267,-0.59166 4.44398,-0.81759 0.39132,-0.22593 2.48067,-3.48704 2.93005,-3.4398 0.44938,0.0472 1.81505,3.67147 2.15084,3.97382 0.3358,0.30236 4.08294,1.2817 4.17689,1.72369 0.0939,0.44198 -2.9309,2.86076 -3.11469,3.27355 -0.18379,0.41279 0.0427,4.27917 -0.34859,4.5051 z" |
342 | + transform="matrix(1.511423,-0.16366377,0.16366377,1.511423,-755.37346,-191.93651)" /> |
343 | + </g> |
344 | + </g> |
345 | + </g> |
346 | + </g> |
347 | +</svg> |
348 | |
349 | === modified file 'metadata.yaml' |
350 | --- metadata.yaml 2012-11-20 20:06:11 +0000 |
351 | +++ metadata.yaml 2014-09-10 19:59:58 +0000 |
352 | @@ -4,6 +4,8 @@ |
353 | subordinate: true |
354 | description: | |
355 | Corosync/Pacemaker |
356 | +categories: |
357 | + - misc |
358 | requires: |
359 | juju-info: |
360 | interface: juju-info |