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

[Tim Van Steenburgh]

Fix tests, proof errors.

=== modified file 'Makefile'
--- Makefile	2014-08-13 15:53:46 +0000
+++ Makefile	2014-09-09 23:46:45 +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-cloud-controller
 	bzr push lp:charms/trusty/nova-cloud-controller
+
+.venv:
+	sudo apt-get install python-virtualenv python-apt
+	virtualenv .venv --system-site-packages
+	.venv/bin/pip install -I nose mock pyyaml
+
+clean:
+	rm -rf .venv
 
=== modified file 'config.yaml'
--- config.yaml	2014-07-29 15:05:01 +0000
+++ config.yaml	2014-09-09 23:46:45 +0000
@@ -97,6 +97,7 @@
   # HA configuration settings
   vip:
     type: string
+    default:
     description: "Virtual IP to use to front API services in ha configuration"
   vip_iface:
     type: string
@@ -120,6 +121,7 @@
        HA Cluster nodes.
   ssl_cert:
     type: string
+    default:
     description: |
       SSL certificate to install and use for API ports.  Setting this value
       and ssl_key will enable reverse proxying, point Nova's entry in the
@@ -127,9 +129,11 @@
       issued by Keystone (if it is configured to do so).
   ssl_key:
     type: string
+    default:
     description: SSL key to use with certificate specified as ssl_cert.
   ssl_ca:
     type: string
+    default:
     description: |
       SSL CA to use with the certificate and key provided - this is only
       required if you are providing a privately signed ssl_cert and ssl_key.
@@ -141,6 +145,7 @@
   # Neutron NVP and VMware NSX plugin configuration
   nvp-controllers:
     type: string
+    default:
     description: Space delimited addresses of NVP/NSX controllers
   nvp-username:
     type: string
@@ -156,12 +161,14 @@
     description: Name of the NVP cluster configuration to create (grizzly only)
   nvp-tz-uuid:
     type: string
+    default:
     description: |
       This is uuid of the default NVP/NSX Transport zone that will be used for
       creating tunneled isolated Quantum networks.  It needs to be created
       in NVP before starting Quantum with the nvp plugin.
   nvp-l3-uuid:
     type: string
+    default:
     description: |
       This is uuid of the default NVP/NSX L3 Gateway Service.
   # end of NVP/NSX configuration