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

[Corey Bryant]

[Ryan Beisner (1chb1n)]

UOSCI bot says:
charm_lint_check #801 trusty-glance for corey.bryant mp239474
    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.801:
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
OK

Full lint output: http://paste.ubuntu.com/8707168/
Build: http://10.98.191.181:8080/job/charm_lint_check/801/

[Ryan Beisner (1chb1n)]

UOSCI bot says:
charm_unit_test #609 trusty-glance for corey.bryant mp239474
    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.609:
----------------------------------------------------------------------
Ran 65 tests in 3.613s

OK

Full unit output: http://paste.ubuntu.com/8707169/
Build: http://10.98.191.181:8080/job/charm_unit_test/609/

[Liam Young (gnuoy)]

lgtm

review: Approve

=== modified file 'tests/basic_deployment.py'
--- tests/basic_deployment.py	2014-10-08 20:18:38 +0000
+++ tests/basic_deployment.py	2014-10-23 20:15:40 +0000
@@ -23,7 +23,7 @@
 #    * Add tests with different storage back ends
 #    * Resolve Essex->Havana juju set charm bug
 
-    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(GlanceBasicDeployment, self).__init__(series, openstack, source, stable)
         self._add_services()