From 2d2e10bfb79eee472249e75225589db71a0da84b Mon Sep 17 00:00:00 2001
From: portdirect <pete@port.direct>
Date: Tue, 16 Jan 2018 22:37:31 -0500
Subject: [PATCH] Gate: Update heat templates to export floating IP

This PS updates the heat template to output the Floating IP, which
makes the gate scripts compatible with the current master clients
when used with newton images.

Change-Id: I8e429b504ede521612c91d7563a8c5e4953bdbb4
---
 tools/deployment/developer/19-use-it.sh        | 10 ++++------
 tools/gate/files/heat-basic-vm-deployment.yaml |  4 ++++
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/tools/deployment/developer/19-use-it.sh b/tools/deployment/developer/19-use-it.sh
index 83f5082e5d..edbd0a4e52 100755
--- a/tools/deployment/developer/19-use-it.sh
+++ b/tools/deployment/developer/19-use-it.sh
@@ -66,12 +66,10 @@ openstack stack create --wait \
     -t ./tools/gate/files/heat-basic-vm-deployment.yaml \
     heat-basic-vm-deployment
 
-FLOATING_IP=$(openstack floating ip show \
-  $(openstack stack resource show \
-      heat-basic-vm-deployment \
-      server_floating_ip \
-      -f value -c physical_resource_id) \
-      -f value -c floating_ip_address)
+FLOATING_IP=$(openstack stack output show \
+    heat-basic-vm-deployment \
+    floating_ip \
+    -f value -c output_value)
 
 function wait_for_ssh_port {
   # Default wait timeout is 300 seconds
diff --git a/tools/gate/files/heat-basic-vm-deployment.yaml b/tools/gate/files/heat-basic-vm-deployment.yaml
index de60e0a45c..8625e772f3 100644
--- a/tools/gate/files/heat-basic-vm-deployment.yaml
+++ b/tools/gate/files/heat-basic-vm-deployment.yaml
@@ -80,3 +80,7 @@ resources:
     properties:
       floating_network: {get_param: public_net}
       port_id: { get_resource: server_port }
+
+outputs:
+  floating_ip:
+    value: {get_attr:  [server_floating_ip, floating_ip_address]}