Merge lp:~corey.bryant/charms/trusty/keystone/use-stable into lp:~openstack-charmers-archive/charms/trusty/keystone/trunk

[Corey Bryant]

[Ryan Beisner (1chb1n)]

UOSCI bot says:
charm_lint_check #800 trusty-keystone for corey.bryant mp239473
    LINT OK: believed to pass, but you should confirm results

LINT Results (max last 4 lines) from
/var/lib/jenkins/workspace/charm_lint_check/make-lint.800:
I: config.yaml: option os-public-network has no default value
I: config.yaml: option os-admin-network has no default value
I: config.yaml: option ssl_cert has no default value
I: config.yaml: option os-internal-network has no default value

Full lint output: http://paste.ubuntu.com/8707153/
Build: http://10.98.191.181:8080/job/charm_lint_check/800/

[Ryan Beisner (1chb1n)]

UOSCI bot says:
charm_unit_test #608 trusty-keystone for corey.bryant mp239473
    UNIT OK: believed to pass, but you should confirm results

UNIT Results (max last 4 lines) from
/var/lib/jenkins/workspace/charm_unit_test/unit-test.608:
----------------------------------------------------------------------
Ran 37 tests in 3.193s

OK

Full unit output: http://paste.ubuntu.com/8707160/
Build: http://10.98.191.181:8080/job/charm_unit_test/608/

[Liam Young (gnuoy)]

lgtm

review: Approve

=== modified file 'tests/basic_deployment.py'
--- tests/basic_deployment.py	2014-09-29 20:36:04 +0000
+++ tests/basic_deployment.py	2014-10-23 20:15:08 +0000
@@ -19,7 +19,7 @@
 class KeystoneBasicDeployment(OpenStackAmuletDeployment):
     """Amulet tests on a basic keystone deployment."""
 
-    def __init__(self, series=None, openstack=None, source=None, stable=False):
+    def __init__(self, series=None, openstack=None, source=None, stable=True):
         """Deploy the entire test environment."""
         super(KeystoneBasicDeployment, self).__init__(series, openstack, source, stable)
         self._add_services()