diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2015-04-03 12:18:15 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2015-04-03 12:18:15 +0000 |
| commit | 4578590799928737aefe95fd1822229af2a6e5e8 (patch) | |
| tree | a43309c01b1bbc20f6e86d551c723f3cf634b316 | |
| parent | 8ec13237dbbd82fac940f2c0ff98e737cb9e4dfa (diff) | |
| parent | d7eaea3b5fc25a3d68c5eea85ea9dc4478e3bfce (diff) | |
Merge "Provide a way to know the boostrap_nodeid IP"
| -rw-r--r-- | bootstrap-config.yaml | 3 | ||||
| -rw-r--r-- | overcloud-without-mergepy.yaml | 1 | ||||
| -rw-r--r-- | puppet/bootstrap-config.yaml | 3 |
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: |