Merge lp:~tvansteenburgh/charms/trusty/nova-compute/fix-tests into lp:~openstack-charmers-archive/charms/trusty/nova-compute/trunk

[Tim Van Steenburgh]

Fix tests, proof errors.

[Charles Butler (lazypower)]

+1 LGTM

review: Approve

=== modified file 'Makefile'
--- Makefile	2014-08-13 15:55:07 +0000
+++ Makefile	2014-09-10 00:05:20 +0000
@@ -5,9 +5,9 @@
 	@flake8 --exclude hooks/charmhelpers hooks unit_tests
 	@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
 
 bin/charm_helpers_sync.py:
 	@mkdir -p bin
@@ -20,3 +20,11 @@
 publish: lint test
 	bzr push lp:charms/nova-compute
 	bzr push lp:charms/trusty/nova-compute
+
+.venv:
+	sudo apt-get install python-virtualenv python-apt
+	virtualenv .venv --system-site-packages
+	.venv/bin/pip install -I nose pyyaml mock
+
+clean:
+	rm -rf .venv

=== added file 'README.txt'
--- README.txt	1970-01-01 00:00:00 +0000
+++ README.txt	2014-09-10 00:05:20 +0000
@@ -0,0 +1,11 @@
+============
+nova-compute
+============
+
+Compute node for Openstack nova.
+
+OpenStack Compute, codenamed Nova, is a cloud computing fabric controller. In
+addition to its "native" API (the OpenStack API), it also supports the Amazon
+EC2 API.
+
+Maintainer: Adam Gandelman <[e-mail]>

=== modified file 'config.yaml'
--- config.yaml	2014-09-02 15:25:14 +0000
+++ config.yaml	2014-09-10 00:05:20 +0000
@@ -91,9 +91,11 @@
     description: Network interface on which to build bridge
   instances-path:
     type: string
+    default:
     description: Instance path to use - empty means default of /var/lib/nova/instances
   config-flags:
     type: string
+    default:
     description: Comma separated list of key=value config flags to be set in nova.conf.
   nagios_context:
     default: "juju"