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

[Tim Van Steenburgh]

Fix tests, proof.

[Charles Butler (lazypower)]

+1 LGTM

review: Approve

=== modified file 'Makefile'
--- Makefile	2014-05-21 10:13:58 +0000
+++ Makefile	2014-09-10 22:38:16 +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 --with-coverage  unit_tests
+	.venv/bin/nosetests --nologcapture --with-coverage  unit_tests
+
+.venv:
+	sudo apt-get install -y python-virtualenv python-apt python-keystoneclient
+	virtualenv .venv --system-site-packages
+	.venv/bin/pip install -I nose mock pyyaml
 
 sync:
 	@charm-helper-sync -c charm-helpers.yaml
@@ -15,3 +20,6 @@
 publish: lint test
 	bzr push lp:charms/keystone
 	bzr push lp:charms/trusty/keystone
+
+clean:
+	rm -rf .venv

=== modified file 'config.yaml'
--- config.yaml	2014-03-27 10:54:38 +0000
+++ config.yaml	2014-09-10 22:38:16 +0000
@@ -92,6 +92,7 @@
   # HA configuration settings
   vip:
     type: string
+    default:
     description: "Virtual IP to use to front keystone in ha configuration"
   vip_iface:
     type: string
@@ -128,6 +129,7 @@
     description: "Use SSL for Keystone itself. Set to 'yes' to enable it."
   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 Keystone's entry in the
@@ -135,9 +137,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.