aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYanis Guenane <yanis.guenane@enovance.com>2015-04-02 09:42:08 +0200
committerYanis Guenane <yanis.guenane@enovance.com>2015-04-02 09:42:08 +0200
commitd7eaea3b5fc25a3d68c5eea85ea9dc4478e3bfce (patch)
tree20a7137027dea88bbfb3266ff5038bac721f9be4
parent61fecfc5754c3d08e38853782fdb875d1156e3b3 (diff)
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
-rw-r--r--bootstrap-config.yaml3
-rw-r--r--overcloud-without-mergepy.yaml1
-rw-r--r--puppet/bootstrap-config.yaml3
3 files changed, 7 insertions, 0 deletions
diff --git a/bootstrap-config.yaml b/bootstrap-config.yaml
index 14ecc005..14da8265 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 c5bc08ad..1134fec6 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 29b7af7d..a8eb7585 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: