Merge lp:~gnuoy/charms/trusty/ceph/fix-six-bug into lp:~openstack-charmers-archive/charms/trusty/ceph/next

[Liam Young]

The recent charm helper sync introduced a bug when the charm is deployed on precise. This is the trusty version of the charm so it wasn't picked up. However, many people (rightly or wrongly) deploy the trusty version on precise and it'd be nice to get them in sync at some point. So, I've fixed the referenced bug for precise deploys.

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

UOSCI bot says:
charm_lint_check #1300 ceph-next for gnuoy mp243311
    LINT OK: passed

LINT Results (max last 5 lines):
  I: config.yaml: option key has no default value
  I: config.yaml: option fsid has no default value
  I: config.yaml: option osd-journal has no default value
  I: config.yaml: option osd-reformat has no default value
  I: config.yaml: option source has no default value

Full lint test output: http://paste.ubuntu.com/9333463/
Build: http://10.98.191.181:8080/job/charm_lint_check/1300/

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

UOSCI bot says:
charm_unit_test #1134 ceph-next for gnuoy mp243311
    UNIT OK: passed

UNIT Results (max last 5 lines):
  hooks/ceph_broker 41 8 80% 39-44, 70-74
  hooks/hooks 175 175 0% 11-334
  TOTAL 409 376 8%
  Ran 6 tests in 0.008s
  OK

Full unit test output: http://paste.ubuntu.com/9333464/
Build: http://10.98.191.181:8080/job/charm_unit_test/1134/

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

UOSCI bot says:
charm_amulet_test #566 ceph-next for gnuoy mp243311
    AMULET OK: passed

AMULET Results (max last 5 lines):
  juju-test.conductor.15-basic-trusty-icehouse DEBUG : 2014-12-01 18:22:41,187 test_restart_on_config_change ERROR: Test not implemented
  juju-test.conductor.15-basic-trusty-icehouse RESULT :
  juju-test.conductor DEBUG : Tearing down osci-sv07 juju environment
  juju-test.conductor DEBUG : Calling "juju destroy-environment -y osci-sv07"
  juju-test INFO : Results: 3 passed, 0 failed, 0 errored

Full amulet test output: http://paste.ubuntu.com/9333651/
Build: http://10.98.191.181:8080/job/charm_amulet_test/566/

[Ryan Beisner (1chb1n)]

Deploy tests succeed for precise-icehouse with the stable ('default') and development ('next') charm sets, when substituting both of these MPs:
      branch: lp:~gnuoy/charms/trusty/mysql/fix-six-bug
      branch: lp:~gnuoy/charms/trusty/ceph/fix-six-bug

review: Approve

=== modified file 'charm-helpers-hooks.yaml'
--- charm-helpers-hooks.yaml	2014-11-07 13:16:26 +0000
+++ charm-helpers-hooks.yaml	2014-12-01 17:36:34 +0000
@@ -1,6 +1,7 @@
 branch: lp:charm-helpers
 destination: hooks/charmhelpers
 include:
+    - __init__
     - core
     - fetch
     - contrib.storage.linux:

=== modified file 'hooks/charmhelpers/__init__.py'
--- hooks/charmhelpers/__init__.py	2013-06-23 19:10:07 +0000
+++ hooks/charmhelpers/__init__.py	2014-12-01 17:36:34 +0000
@@ -0,0 +1,22 @@
+# Bootstrap charm-helpers, installing its dependencies if necessary using
+# only standard libraries.
+import subprocess
+import sys
+
+try:
+    import six  # flake8: noqa
+except ImportError:
+    if sys.version_info.major == 2:
+        subprocess.check_call(['apt-get', 'install', '-y', 'python-six'])
+    else:
+        subprocess.check_call(['apt-get', 'install', '-y', 'python3-six'])
+    import six  # flake8: noqa
+
+try:
+    import yaml  # flake8: noqa
+except ImportError:
+    if sys.version_info.major == 2:
+        subprocess.check_call(['apt-get', 'install', '-y', 'python-yaml'])
+    else:
+        subprocess.check_call(['apt-get', 'install', '-y', 'python3-yaml'])
+    import yaml  # flake8: noqa