Juju Charms Collection
heat package

Merge lp:~jjo/charms/trusty/heat/fix-heat_conf-encryption_key-and-auth_uri-lp1368645-lp1368621 into lp:~openstack-charmers-archive/charms/trusty/heat/next

  1. Trusty Tahr (14.04)
  2. fix-heat_conf-encryption_key-and-auth_uri-lp1368645-lp1368621
  3. Merge into next
Proposed by JuanJo Ciarlante
Status: Merged
Merged at revision: 27
Proposed branch: lp:~jjo/charms/trusty/heat/fix-heat_conf-encryption_key-and-auth_uri-lp1368645-lp1368621
Merge into: lp:~openstack-charmers-archive/charms/trusty/heat/next
Diff against target: 24 lines (+2/-1)
2 files modified
hooks/heat_context.py (+1/-0)
templates/heat.conf (+1/-1)
To merge this branch: bzr merge lp:~jjo/charms/trusty/heat/fix-heat_conf-encryption_key-and-auth_uri-lp1368645-lp1368621
Reviewer Review Type Date Requested Status
OpenStack Charmers Pending
Review via email: mp+241945@code.launchpad.net
To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'hooks/heat_context.py'
2--- hooks/heat_context.py 2014-04-12 21:04:58 +0000
3+++ hooks/heat_context.py 2014-11-17 12:13:46 +0000
4@@ -43,6 +43,7 @@
5 encryption = pwgen(16)
6 with open(encryption_path, 'w') as enc:
7 enc.write(encryption)
8+ return encryption
9
10
11 class EncryptionContext(context.OSContextGenerator):
12
13=== modified file 'templates/heat.conf'
14--- templates/heat.conf 2014-04-15 12:24:23 +0000
15+++ templates/heat.conf 2014-11-17 12:13:46 +0000
16@@ -40,7 +40,7 @@
17
18 {% if auth_host -%}
19 [keystone_authtoken]
20-auth_uri = {{ service_protocol }}://{{ service_host }}:{{ service_port }}/
21+auth_uri = {{ service_protocol }}://{{ service_host }}:{{ service_port }}/v2.0
22 auth_host = {{ auth_host }}
23 auth_port = {{ auth_port }}
24 auth_protocol = {{ auth_protocol }}

Subscribers

People subscribed via source and target branches