From d7eaea3b5fc25a3d68c5eea85ea9dc4478e3bfce Mon Sep 17 00:00:00 2001
From: Yanis Guenane <yanis.guenane@enovance.com>
Date: Thu, 2 Apr 2015 09:42:08 +0200
Subject: [PATCH] Provide a way to know the boostrap_nodeid IP

Currently it is possible to know what is the hostname of the boostrap
nodeid but not its IP. Since depending on the use case the use of the IP
might be needed, a way to have access to this information should be
provided.

Change-Id: I9d0a7ee7de2088ddb87e0d8a8ae2b3ac75b0e78d
---
 bootstrap-config.yaml          | 3 +++
 overcloud-without-mergepy.yaml | 1 +
 puppet/bootstrap-config.yaml   | 3 +++
 3 files changed, 7 insertions(+)

diff --git a/bootstrap-config.yaml b/bootstrap-config.yaml
index 14ecc005e6..14da82658a 100644
--- a/bootstrap-config.yaml
+++ b/bootstrap-config.yaml
@@ -4,6 +4,8 @@ description: 'Bootstrap Config'
 parameters:
   bootstrap_nodeid:
     type: string
+  bootstrap_nodeid_ip:
+    type: string
 
 resources:
 
@@ -13,6 +15,7 @@ resources:
       config:
         bootstrap_host:
           bootstrap_nodeid: {get_param: bootstrap_nodeid}
+          bootstrap_nodeid_ip: {get_param: bootstrap_nodeid_ip}
 
 outputs:
   config_id:
diff --git a/overcloud-without-mergepy.yaml b/overcloud-without-mergepy.yaml
index c5bc08ad36..1134fec671 100644
--- a/overcloud-without-mergepy.yaml
+++ b/overcloud-without-mergepy.yaml
@@ -745,6 +745,7 @@ resources:
     type: OS::TripleO::BootstrapNode::SoftwareConfig
     properties:
       bootstrap_nodeid: {get_attr: [Controller, resource.0.hostname]}
+      bootstrap_nodeid_ip: {get_attr: [Controller, resource.0.ip_address]}
 
   ControllerBootstrapNodeDeployment:
     type: OS::Heat::StructuredDeployments
diff --git a/puppet/bootstrap-config.yaml b/puppet/bootstrap-config.yaml
index 29b7af7db6..a8eb758570 100644
--- a/puppet/bootstrap-config.yaml
+++ b/puppet/bootstrap-config.yaml
@@ -4,6 +4,8 @@ description: 'Bootstrap Config Puppet'
 parameters:
   bootstrap_nodeid:
     type: string
+  bootstrap_nodeid_ip:
+    type: string
 
 resources:
 
@@ -16,6 +18,7 @@ resources:
             bootstrap_node:
               mapped_data:
                 bootstrap_nodeid: {get_param: bootstrap_nodeid}
+                bootstrap_nodeid_ip: {get_param: bootstrap_nodeid_ip}
 
 outputs:
   config_id: