Merge lp:~hopem/charms/trusty/heat/lp1368625 into lp:~openstack-charmers-archive/charms/trusty/heat/next

[Edward Hope-Morley]

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

charm_lint_check #12923 heat-next for hopem mp276243
    LINT OK: passed

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

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

charm_unit_test #11999 heat-next for hopem mp276243
    UNIT OK: passed

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

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

charm_amulet_test #7666 heat-next for hopem mp276243
    AMULET FAIL: amulet-test failed

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

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

[Liam Young (gnuoy)]

Amulet fail looks like unrelated undercloud issue, +1

review: Approve

=== modified file 'config.yaml'
--- config.yaml	2015-09-21 19:35:41 +0000
+++ config.yaml	2015-10-30 11:03:46 +0000
@@ -1,4 +1,12 @@
 options:
+  debug:
+    default: False
+    type: boolean
+    description: Enable debug logging.
+  verbose:
+    default: False
+    type: boolean
+    description: Enable verbose logging.
   openstack-origin:
     default: distro
     type: string
 
=== modified file 'hooks/heat_utils.py'
--- hooks/heat_utils.py	2015-10-08 13:13:09 +0000
+++ hooks/heat_utils.py	2015-10-30 11:03:46 +0000
@@ -84,7 +84,8 @@
                      HeatIdentityServiceContext(service=SVC, service_user=SVC),
                      HeatHAProxyContext(),
                      EncryptionContext(),
-                     context.SyslogContext()]
+                     context.SyslogContext(),
+                     context.LogLevelContext()]
     }),
     (HEAT_API_PASTE, {
         'services': [s for s in BASE_SERVICES if 'api' in s],
 
=== modified file 'templates/heat.conf'
--- templates/heat.conf	2015-04-02 12:33:08 +0000
+++ templates/heat.conf	2015-10-30 11:03:46 +0000
@@ -1,7 +1,7 @@
 [DEFAULT]
 use_syslog = {{ use_syslog }}
-debug = False
-verbose = False
+verbose = {{ verbose }}
+debug = {{ debug }}
 log_dir = /var/log/heat
 instance_user=ec2-user
 instance_driver=heat.engine.nova