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

[Corey Bryant]

[uosci-testing-bot (uosci-testing-bot)]

charm_lint_check #1360 trusty-glance for corey.bryant mp248005
    LINT OK: passed

Build: http://10.245.162.77:8080/job/charm_lint_check/1360/

[uosci-testing-bot (uosci-testing-bot)]

charm_unit_test #1313 trusty-glance for corey.bryant mp248005
    UNIT OK: passed

Build: http://10.245.162.77:8080/job/charm_unit_test/1313/

[uosci-testing-bot (uosci-testing-bot)]

charm_amulet_test #1547 trusty-glance for corey.bryant mp248005
    AMULET FAIL: amulet-test failed

AMULET Results (max last 2 lines):
  ERROR subprocess encountered error code 1
  make: *** [test] Error 1

Full amulet test output: http://paste.ubuntu.com/9939737/
Build: http://10.245.162.77:8080/job/charm_amulet_test/1547/

[uosci-testing-bot (uosci-testing-bot)]

charm_amulet_test #1559 glance for corey.bryant mp248005
    AMULET OK: passed

Build: http://10.245.162.77:8080/job/charm_amulet_test/1559/

=== modified file 'tests/basic_deployment.py'
--- tests/basic_deployment.py	2014-10-08 20:18:38 +0000
+++ tests/basic_deployment.py	2015-01-29 16:11:26 +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()