Merge lp:~1chb1n/charms/trusty/ceph-osd/stable-flip-tests-helper-syncs into lp:~openstack-charmers-archive/charms/trusty/ceph-osd/trunk

[Ryan Beisner]

flip charmhelper sync yamls and amulet tests to use stable branches

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

charm_unit_test #7173 ceph-osd for 1chb1n mp267558
    UNIT FAIL: unit-test missing

UNIT Results (max last 2 lines):
INFO:root:Search string not found in makefile target commands.
ERROR:root:No make target was executed.

Full unit test output: http://paste.ubuntu.com/12049759/
Build: http://10.245.162.77:8080/job/charm_unit_test/7173/

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

charm_lint_check #7751 ceph-osd for 1chb1n mp267558
    LINT OK: passed

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

[Corey Bryant (corey.bryant)]

review: Approve

=== modified file 'charm-helpers-hooks.yaml'
--- charm-helpers-hooks.yaml	2015-08-10 16:33:15 +0000
+++ charm-helpers-hooks.yaml	2015-08-10 17:45:34 +0000
@@ -1,4 +1,4 @@
-branch: lp:charm-helpers
+branch: lp:~openstack-charmers/charm-helpers/stable
 destination: hooks/charmhelpers
 include:
     - core
 
=== modified file 'charm-helpers-tests.yaml'
--- charm-helpers-tests.yaml	2015-08-10 16:33:15 +0000
+++ charm-helpers-tests.yaml	2015-08-10 17:45:34 +0000
@@ -1,4 +1,4 @@
-branch: lp:charm-helpers
+branch: lp:~openstack-charmers/charm-helpers/stable
 destination: tests/charmhelpers
 include:
     - contrib.amulet
 
=== modified file 'tests/basic_deployment.py'
--- tests/basic_deployment.py	2015-08-10 16:33:15 +0000
+++ tests/basic_deployment.py	2015-08-10 17:45:34 +0000
@@ -19,7 +19,7 @@
     """Amulet tests on a basic ceph-osd deployment."""
 
     def __init__(self, series=None, openstack=None, source=None,
-                 stable=False):
+                 stable=True):
         """Deploy the entire test environment."""
         super(CephOsdBasicDeployment, self).__init__(series, openstack,
                                                      source, stable)