From 189912518a6ecac8674243ecdbbb70ab79f3626a Mon Sep 17 00:00:00 2001 From: Ryan Beisner Date: Tue, 14 Apr 2015 05:16:31 +0000 Subject: [PATCH 1/5] sync charm helpers --- hooks/charmhelpers/contrib/openstack/templates/git.upstart | 4 ++++ hooks/charmhelpers/core/strutils.py | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/hooks/charmhelpers/contrib/openstack/templates/git.upstart b/hooks/charmhelpers/contrib/openstack/templates/git.upstart index da94ad12..4bed404b 100644 --- a/hooks/charmhelpers/contrib/openstack/templates/git.upstart +++ b/hooks/charmhelpers/contrib/openstack/templates/git.upstart @@ -9,5 +9,9 @@ respawn 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 -%} diff --git a/hooks/charmhelpers/core/strutils.py b/hooks/charmhelpers/core/strutils.py index efc4402e..a2a784aa 100644 --- a/hooks/charmhelpers/core/strutils.py +++ b/hooks/charmhelpers/core/strutils.py @@ -33,9 +33,9 @@ def bool_from_string(value): 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) From 57ef9b2454e702df0bf72cc6d7bfab482d49708d Mon Sep 17 00:00:00 2001 From: Ryan Beisner Date: Tue, 14 Apr 2015 05:16:59 +0000 Subject: [PATCH 2/5] flip amulet test debug on --- tests/basic_deployment.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/basic_deployment.py b/tests/basic_deployment.py index aeb2fafe..b9f6980f 100644 --- a/tests/basic_deployment.py +++ b/tests/basic_deployment.py @@ -14,7 +14,7 @@ from charmhelpers.contrib.openstack.amulet.utils import ( ) # Use DEBUG to turn on debug logging -u = OpenStackAmuletUtils(ERROR) +u = OpenStackAmuletUtils(DEBUG) class NovaBasicDeployment(OpenStackAmuletDeployment): From f6f44e153a530fb7cd9d3a5ddd35429fd9d36515 Mon Sep 17 00:00:00 2001 From: Ryan Beisner Date: Tue, 14 Apr 2015 05:17:22 +0000 Subject: [PATCH 3/5] flip amulet next charm on --- tests/basic_deployment.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/basic_deployment.py b/tests/basic_deployment.py index b9f6980f..0fd8ece5 100644 --- a/tests/basic_deployment.py +++ b/tests/basic_deployment.py @@ -20,7 +20,7 @@ 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() From 5babd7e1c198401083c11e8c129b2d803e4a722a Mon Sep 17 00:00:00 2001 From: Ryan Beisner Date: Tue, 14 Apr 2015 05:21:40 +0000 Subject: [PATCH 4/5] explicitly install librbd1 re: bug 1440953 --- hooks/nova_compute_utils.py | 1 + 1 file changed, 1 insertion(+) diff --git a/hooks/nova_compute_utils.py b/hooks/nova_compute_utils.py index e4c0d46e..3d1aa712 100644 --- a/hooks/nova_compute_utils.py +++ b/hooks/nova_compute_utils.py @@ -57,6 +57,7 @@ TEMPLATES = 'templates/' BASE_PACKAGES = [ 'nova-compute', 'genisoimage', # was missing as a package dependency until raring. + 'librbd1', # bug 1440953 'python-six', ] From f8d2ca8352bdebb250deb94bf7db74b4a88b8a13 Mon Sep 17 00:00:00 2001 From: Ryan Beisner Date: Tue, 14 Apr 2015 05:26:04 +0000 Subject: [PATCH 5/5] delint --- hooks/nova_compute_utils.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hooks/nova_compute_utils.py b/hooks/nova_compute_utils.py index 3d1aa712..56dc1074 100644 --- a/hooks/nova_compute_utils.py +++ b/hooks/nova_compute_utils.py @@ -57,7 +57,7 @@ TEMPLATES = 'templates/' BASE_PACKAGES = [ 'nova-compute', 'genisoimage', # was missing as a package dependency until raring. - 'librbd1', # bug 1440953 + 'librbd1', # bug 1440953 'python-six', ]