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

[Corey Bryant]

[Ryan Beisner (1chb1n)]

UOSCI bot says:
charm_lint_check #812 trusty-swift-proxy for corey.bryant mp239469
    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.812:
W: config.yaml: option keystone-auth-host does not have the keys: default
W: config.yaml: option ssl_cert does not have the keys: default
W: config.yaml: option os-public-network does not have the keys: default
W: config.yaml: option keystone-admin-password does not have the keys: default

Full lint output: http://paste.ubuntu.com/8707217/
Build: http://10.98.191.181:8080/job/charm_lint_check/812/

[Ryan Beisner (1chb1n)]

UOSCI bot says:
charm_unit_test #620 trusty-swift-proxy for corey.bryant mp239469
    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.620:
----------------------------------------------------------------------
Ran 5 tests in 0.177s

OK

Full unit output: http://paste.ubuntu.com/8707218/
Build: http://10.98.191.181:8080/job/charm_unit_test/620/

[Liam Young (gnuoy)]

lgtm

review: Approve

=== modified file 'tests/basic_deployment.py'
--- tests/basic_deployment.py	2014-10-06 21:35:47 +0000
+++ tests/basic_deployment.py	2014-10-23 20:13:24 +0000
@@ -20,7 +20,7 @@
 class SwiftProxyBasicDeployment(OpenStackAmuletDeployment):
     """Amulet tests on a basic swift-proxy deployment."""
 
-    def __init__(self, series, openstack=None, source=None, stable=False):
+    def __init__(self, series, openstack=None, source=None, stable=True):
         """Deploy the entire test environment."""
         super(SwiftProxyBasicDeployment, self).__init__(series, openstack,
                                                         source, stable)