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

Proposed by Edward Hope-Morley
Status: Merged
Merged at revision: 59
Proposed branch: lp:~hopem/charms/trusty/heat/lp1368625
Merge into: lp:~openstack-charmers-archive/charms/trusty/heat/next
Diff against target: 44 lines (+12/-3)
3 files modified
config.yaml (+8/-0)
hooks/heat_utils.py (+2/-1)
templates/heat.conf (+2/-2)
To merge this branch: bzr merge lp:~hopem/charms/trusty/heat/lp1368625
Reviewer Review Type Date Requested Status
Liam Young (community) Approve
Review via email: mp+276243@code.launchpad.net
To post a comment you must log in.
Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

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

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

Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

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

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

Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

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/

Revision history for this message
Liam Young (gnuoy) wrote :

Amulet fail looks like unrelated undercloud issue, +1

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'config.yaml'
2--- config.yaml 2015-09-21 19:35:41 +0000
3+++ config.yaml 2015-10-30 11:03:46 +0000
4@@ -1,4 +1,12 @@
5 options:
6+ debug:
7+ default: False
8+ type: boolean
9+ description: Enable debug logging.
10+ verbose:
11+ default: False
12+ type: boolean
13+ description: Enable verbose logging.
14 openstack-origin:
15 default: distro
16 type: string
17
18=== modified file 'hooks/heat_utils.py'
19--- hooks/heat_utils.py 2015-10-08 13:13:09 +0000
20+++ hooks/heat_utils.py 2015-10-30 11:03:46 +0000
21@@ -84,7 +84,8 @@
22 HeatIdentityServiceContext(service=SVC, service_user=SVC),
23 HeatHAProxyContext(),
24 EncryptionContext(),
25- context.SyslogContext()]
26+ context.SyslogContext(),
27+ context.LogLevelContext()]
28 }),
29 (HEAT_API_PASTE, {
30 'services': [s for s in BASE_SERVICES if 'api' in s],
31
32=== modified file 'templates/heat.conf'
33--- templates/heat.conf 2015-04-02 12:33:08 +0000
34+++ templates/heat.conf 2015-10-30 11:03:46 +0000
35@@ -1,7 +1,7 @@
36 [DEFAULT]
37 use_syslog = {{ use_syslog }}
38-debug = False
39-verbose = False
40+verbose = {{ verbose }}
41+debug = {{ debug }}
42 log_dir = /var/log/heat
43 instance_user=ec2-user
44 instance_driver=heat.engine.nova

Subscribers

People subscribed via source and target branches