Merge lp:~tvansteenburgh/charms/precise/openstack-dashboard/fix-tests into lp:~openstack-charmers-archive/charms/precise/openstack-dashboard/trunk

[Tim Van Steenburgh]

Fix tests, proofs.

[James Page (james-page)]

defaults fixed in next; postponing virtualenv use until we have a broader team discussion.

review: Approve

=== modified file 'Makefile'
--- Makefile	2014-05-21 10:15:35 +0000
+++ Makefile	2014-09-11 01:22:32 +0000
@@ -5,9 +5,14 @@
 	@flake8 --exclude hooks/charmhelpers hooks unit_tests
 	@charm proof
 
-test:
+test: .venv
 	@echo Starting tests...
-	@$(PYTHON) /usr/bin/nosetests --nologcapture unit_tests
+	.venv/bin/nosetests --nologcapture unit_tests
+
+.venv:
+	sudo apt-get install -y python-virtualenv python-apt
+	virtualenv .venv --system-site-packages
+	.venv/bin/pip install -I nose mock pyyaml
 
 sync:
 	@charm-helper-sync -c charm-helpers-sync.yaml
@@ -15,3 +20,6 @@
 publish: lint test
 	bzr push lp:charms/openstack-dashboard
 	bzr push lp:charms/trusty/openstack-dashboard
+
+clean:
+	rm -rf .venv

=== modified file 'config.yaml'
--- config.yaml	2014-02-03 12:34:56 +0000
+++ config.yaml	2014-09-11 01:22:32 +0000
@@ -35,6 +35,7 @@
     vip:
         type: string
         description: "Virtual IP to use to front openstack dashboard ha configuration"
+        default:
     vip_iface:
         type: string
         default: eth0
@@ -68,10 +69,12 @@
           Swifts's entry in the Keystone catalog to use https, and override
           any certficiate and key issued by Keystone (if it is configured to
           do so).
+        default:
     ssl_key:
         type: string
         description: |
           Base64 encoded SSL key to use with certificate specified as ssl_cert.
+        default:
     offline-compression:
         type: string
         default: "yes"
@@ -87,3 +90,4 @@
     secret:
         type: string
         description: Secret for Horizon to use when securing internal data; set this when using multiple dashboard units.
+        default: