From a2ae89f4ead589c9934035b3abaa919604510a44 Mon Sep 17 00:00:00 2001
From: Ben Nemec <bnemec@redhat.com>
Date: Wed, 22 Apr 2015 15:41:57 -0500
Subject: [PATCH] Enable Heat SSL support

The referenced bug in Heat has been fixed, so we can go ahead and
register the endpoint for https.

Also, this was buggy before anyway.  We were registering a non-ssl
port with an https prefix.

A comparable change will be proposed for os-cloud-config.

Change-Id: I490a65f0c64bcf2529a393364447f2cb9318598a
---
 scripts/setup-endpoints | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/setup-endpoints b/scripts/setup-endpoints
index a08f6037..9e86d7e6 100755
--- a/scripts/setup-endpoints
+++ b/scripts/setup-endpoints
@@ -115,9 +115,9 @@ else
     PUBLIC_HOST=$INTERNAL_HOST
 fi
 
-# Skip Heat for now... see heat bug https://launchpad.net/bugs/1235555
 NORMAL_PORT=8004
-SSL_PORT=8004
+SSL_PORT=${SSL:+13004}
+SSL_PORT=${SSL_PORT:-$NORMAL_PORT}
 PASSWORD=$HEAT_PASSWORD register-endpoint $DEBUG -r $REGION -d "Heat Service" heat orchestration -i ${INTERNAL_HOST}${NORMAL_PORT} ${PUBLIC_HOST}${SSL_PORT}
 
 NORMAL_PORT=9696