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

[Corey Bryant]

[Ryan Beisner (1chb1n)]

UOSCI bot says:
charm_lint_check #802 trusty-cinder for corey.bryant mp239475
    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.802:
I: config.yaml: option config-flags 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
I: config.yaml: option os-public-network has no default value

Full lint output: http://paste.ubuntu.com/8707172/
Build: http://10.98.191.181:8080/job/charm_lint_check/802/

[Ryan Beisner (1chb1n)]

UOSCI bot says:
charm_unit_test #610 trusty-cinder for corey.bryant mp239475
    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.610:
----------------------------------------------------------------------
Ran 86 tests in 5.866s

OK

Full unit output: http://paste.ubuntu.com/8707178/
Build: http://10.98.191.181:8080/job/charm_unit_test/610/

[Liam Young (gnuoy)]

lgtm

review: Approve

=== modified file 'tests/basic_deployment.py'
--- tests/basic_deployment.py	2014-10-09 09:49:21 +0000
+++ tests/basic_deployment.py	2014-10-23 20:16:37 +0000
@@ -28,7 +28,7 @@
     # NOTE(beisner):  Features and tests vary across Openstack releases.
     # https://wiki.openstack.org/wiki/CinderSupportMatrix
 
-    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(CinderBasicDeployment, self).__init__(series, openstack, source,
                                                     stable)