Merge lp:~1chb1n/charms/trusty/nova-compute/next-amulet-lp1440953 into lp:~openstack-charmers-archive/charms/trusty/nova-compute/next

[Ryan Beisner]

- explicitly install librbd1 re: bug 1440953
 - flip amulet next charm on
 - flip amulet test debug on
 - sync charm helpers
 - delint

Also resolves amulet test failure on nova-cloud-controller.

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

charm_lint_check #3321 nova-compute-next for 1chb1n mp256104
    LINT OK: passed

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

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

charm_unit_test #3109 nova-compute-next for 1chb1n mp256104
    UNIT OK: passed

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

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

charm_amulet_test #3142 nova-compute-next for 1chb1n mp256104
    AMULET FAIL: amulet-test failed

AMULET Results (max last 2 lines):
make: *** [test] Error 1
ERROR:root:Make target returned non-zero.

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

[James Page (james-page)]

This looks fine - dealing with the amulet test failure (due to landed commit not being fully tested).

=== modified file 'hooks/charmhelpers/contrib/openstack/templates/git.upstart'
--- hooks/charmhelpers/contrib/openstack/templates/git.upstart	2015-03-31 15:01:48 +0000
+++ hooks/charmhelpers/contrib/openstack/templates/git.upstart	2015-04-14 05:37:11 +0000
@@ -9,5 +9,9 @@
 exec start-stop-daemon --start --chuid {{ user_name }} \
             --chdir {{ start_dir }} --name {{ process_name }} \
             --exec {{ executable_name }} -- \
+            {% for config_file in config_files -%}
             --config-file={{ config_file }} \
+            {% endfor -%}
+            {% if log_file -%}
             --log-file={{ log_file }}
+            {% endif -%}

=== modified file 'hooks/charmhelpers/core/strutils.py'
--- hooks/charmhelpers/core/strutils.py	2015-02-19 04:35:23 +0000
+++ hooks/charmhelpers/core/strutils.py	2015-04-14 05:37:11 +0000
@@ -33,9 +33,9 @@
 
     value = value.strip().lower()
 
-    if value in ['y', 'yes', 'true', 't']:
+    if value in ['y', 'yes', 'true', 't', 'on']:
         return True
-    elif value in ['n', 'no', 'false', 'f']:
+    elif value in ['n', 'no', 'false', 'f', 'off']:
         return False
 
     msg = "Unable to interpret string value '%s' as boolean" % (value)

=== modified file 'hooks/nova_compute_utils.py'
--- hooks/nova_compute_utils.py	2015-04-13 12:22:05 +0000
+++ hooks/nova_compute_utils.py	2015-04-14 05:37:11 +0000
@@ -57,6 +57,7 @@
 BASE_PACKAGES = [
     'nova-compute',
     'genisoimage',  # was missing as a package dependency until raring.
+    'librbd1',  # bug 1440953
     'python-six',
 ]
 

=== modified file 'tests/basic_deployment.py'
--- tests/basic_deployment.py	2015-03-31 13:31:23 +0000
+++ tests/basic_deployment.py	2015-04-14 05:37:11 +0000
@@ -14,13 +14,13 @@
 )
 
 # Use DEBUG to turn on debug logging
-u = OpenStackAmuletUtils(ERROR)
+u = OpenStackAmuletUtils(DEBUG)
 
 
 class NovaBasicDeployment(OpenStackAmuletDeployment):
     """Amulet tests on a basic nova compute deployment."""
 
-    def __init__(self, series=None, openstack=None, source=None, stable=True):
+    def __init__(self, series=None, openstack=None, source=None, stable=False):
         """Deploy the entire test environment."""
         super(NovaBasicDeployment, self).__init__(series, openstack, source, stable)
         self._add_services()