Merge lp:~aisrael/charms/precise/hacluster/fix-charm-proof-lint-test into lp:charms/hacluster

[Adam Israel]

Fixed charm proof warnings and make lint/test failures.

Unmerged revisions

24. By Adam Israel on 2014-09-11

Add categories to metadata.yaml, default: stanzas to config.yaml, and generic icon.svg, in order to pass charm proof
Fixed error in hooks.py so make lint passes
Added virtualenv to Makefile so that make test passes
Added empty unit_test directory so make test passes

=== modified file 'Makefile'
--- Makefile	2014-04-11 09:57:50 +0000
+++ Makefile	2014-09-11 19:00:42 +0000
@@ -1,13 +1,18 @@
 #!/usr/bin/make
 PYTHON := /usr/bin/env python
 
+.venv:
+	sudo apt-get install -y python-apt python-virtualenv
+	virtualenv .venv --system-site-packages
+	.venv/bin/pip install -I nose testtools mock
 lint:
 	@flake8 --exclude hooks/charmhelpers hooks
 	@charm proof
 
-test:
+test:  .venv
 	@echo Starting tests...
-	@$(PYTHON) /usr/bin/nosetests --nologcapture --with-coverage  unit_tests
+	.venv/bin/nosetests --nologcapture --with-coverage  unit_tests
 
 sync:
 	@charm-helper-sync -c charm-helpers.yaml
+

=== modified file 'config.yaml'
--- config.yaml	2014-01-29 20:48:59 +0000
+++ config.yaml	2014-09-11 19:00:42 +0000
@@ -32,9 +32,11 @@
      This requires MAAS credentials be provided and each node's power
      parameters are properly configured in its invenvory.
   maas_url:
+    default:
     type: string
     description: MAAS API endpoint (required for STONITH).
   maas_credentials:
+    default:
     type: string
     description: MAAS credentials (required for STONITH).
   cluster_count:
@@ -42,6 +44,7 @@
     default: 2
     description: Number of peer units required to bootstrap cluster services.
   monitor_host:
+    default:
     type: string
     description: |
      One or more IPs, separated by space, that will be used as a saftey check

=== modified file 'hooks/hooks.py'
--- hooks/hooks.py	2014-04-11 10:14:56 +0000
+++ hooks/hooks.py	2014-09-11 19:00:42 +0000
@@ -260,7 +260,7 @@
             # Put the services in HA, if not already done so
             # if not pcmk.is_resource_present(res_name):
             if not pcmk.crm_opt_exists(res_name):
-                if not res_name in resource_params:
+                if res_name not in resource_params:
                     cmd = 'crm -w -F configure primitive %s %s' % (res_name,
                                                                    res_type)
                 else:

=== modified file 'metadata.yaml'
--- metadata.yaml	2012-11-20 20:06:11 +0000
+++ metadata.yaml	2014-09-11 19:00:42 +0000
@@ -4,6 +4,8 @@
 subordinate: true
 description: |
  Corosync/Pacemaker
+categories:
+- misc
 requires:
   juju-info:
     interface: juju-info