Merge lp:~tvansteenburgh/charms/precise/nova-compute-vmware/fix-tests into lp:charms/nova-compute-vmware

[Tim Van Steenburgh]

Fix tests, proof.

Unmerged revisions

106. By Tim Van Steenburgh on 2014-09-11

Fix tests, proof

=== modified file 'Makefile'
--- Makefile	2014-06-17 14:43:14 +0000
+++ Makefile	2014-09-11 00:09:54 +0000
@@ -5,10 +5,14 @@
 	@flake8 --exclude hooks/charmhelpers hooks unit_tests
 	@charm proof
 
-test:
+test: .venv
 	@echo Starting tests...
-	@$(PYTHON) /usr/bin/nosetests --nologcapture --with-coverage -v unit_tests
+	.venv/bin/nosetests --nologcapture --with-coverage -v unit_tests
 
+.venv:
+	sudo apt-get install -y python-virtualenv python-apt
+	virtualenv .venv --system-site-packages
+	.venv/bin/pip install -I nose
 
 bin/charm_helpers_sync.py:
 	@mkdir -p bin
@@ -21,3 +25,6 @@
 publish: lint test
 	bzr push lp:charms/nova-compute-vmware
 	bzr push lp:charms/trusty/nova-compute-vmware
+
+clean:
+	rm -rf .venv/ .coverage

=== modified file 'config.yaml'
--- config.yaml	2014-06-17 13:12:01 +0000
+++ config.yaml	2014-09-11 00:09:54 +0000
@@ -47,6 +47,7 @@
   config-flags:
     type: string
     description: Comma separated list of key=value config flags to be set in nova.conf.
+    default:
   nagios_context:
     default: "juju"
     type: string
@@ -61,15 +62,19 @@
   host-ip:
     type: string
     description: IP address for connecting to VMware VC server.
+    default:
   host-username:
     type: string
     description: Username for authenticating with VMware VC server.
+    default:
   host-password:
     type: string
     description: Password for authenticating with VMware VC server.
+    default:
   cluster-name:
     type: string
     description: VMware Cluster name. Multiple clusters may be managed - space delimited.
+    default:
   flat-network-bridge:
     type: string
     default: br100