From feb549985febd594c0d692d1edab39c9ccc8a51b Mon Sep 17 00:00:00 2001
From: JuanJo Ciarlante <jjo@canonical.com>
Date: Sun, 16 Nov 2014 18:41:32 -0300
Subject: [PATCH] [jjo] fix heat.conf encryption_key (lp#1368645) and auth_uri
 (lp#1368621)

---
 hooks/heat_context.py | 1 +
 templates/heat.conf   | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/hooks/heat_context.py b/hooks/heat_context.py
index c0f21ed..ae1b4dc 100644
--- a/hooks/heat_context.py
+++ b/hooks/heat_context.py
@@ -43,6 +43,7 @@ def get_encryption_key():
             encryption = pwgen(16)
         with open(encryption_path, 'w') as enc:
             enc.write(encryption)
+    return encryption
 
 
 class EncryptionContext(context.OSContextGenerator):
diff --git a/templates/heat.conf b/templates/heat.conf
index f349d4c..a9f417e 100644
--- a/templates/heat.conf
+++ b/templates/heat.conf
@@ -40,7 +40,7 @@ kombu_ssl_ca_certs = {{ rabbit_ssl_ca }}
 
 {% if auth_host -%}
 [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_port = {{ auth_port }}
 auth_protocol = {{ auth_protocol }}