openstack/charm-heat
Code Issues Proposed changes

[jjo] fix heat.conf encryption_key (lp#1368645) and auth_uri (lp#1368621)

Browse Source
This commit is contained in:
JuanJo Ciarlante 2014-11-16 18:41:32 -03:00
parent 6c65e761fb
commit feb549985f
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
hooks/heat_context.py
View File

@ -43,6 +43,7 @@ def get_encryption_key():
encryption = pwgen(16) encryption = pwgen(16)
with open(encryption_path, 'w') as enc: with open(encryption_path, 'w') as enc:
enc.write(encryption) enc.write(encryption)
return encryption
class EncryptionContext(context.OSContextGenerator): class EncryptionContext(context.OSContextGenerator):

2
templates/heat.conf
View File

@ -40,7 +40,7 @@ kombu_ssl_ca_certs = {{ rabbit_ssl_ca }}
{% if auth_host -%} {% if auth_host -%}
[keystone_authtoken] [keystone_authtoken]
auth_uri = {{ service_protocol }}://{{ service_host }}:{{ service_port }}/ auth_uri = {{ service_protocol }}://{{ service_host }}:{{ service_port }}/v2.0
auth_host = {{ auth_host }} auth_host = {{ auth_host }}
auth_port = {{ auth_port }} auth_port = {{ auth_port }}
auth_protocol = {{ auth_protocol }} auth_protocol = {{ auth_protocol }}