diff options
| author |   Robert Collins <rbtcollins@hp.com> | 2014-05-28 16:26:21 +1200 |
|---|---|---|
| committer | Robert Collins <rbtcollins@hp.com> | 2014-05-28 18:52:18 +1200 |
| commit | 8c39eda54cae72049f06ada726c13cfe115268a9 (patch) | |
| tree | f5dbd6086ca5342df4f04eb5c1edcfdbf91845ad | |
| parent | 9b7099a4b49cf68caa2ea54ef9d02a1ad640b257 (diff) | |
Export new bootstack keys for cluster init.
These provide a single consistent interface for checking whether
a given node is the bootstrap node, or not the bootstrap node
for database initialisation etc.
Change-Id: I7c5a09cb3477b61c4050e4a47a680ffc9aee97d8
| -rw-r--r-- | overcloud-source.yaml | 19 | ||||
| -rw-r--r-- | undercloud-source.yaml | 19 |
2 files changed, 38 insertions, 0 deletions
diff --git a/overcloud-source.yaml b/overcloud-source.yaml index 040506e0..9cbc2030 100644 --- a/overcloud-source.yaml +++ b/overcloud-source.yaml @@ -361,8 +361,21 @@ Resources: admin-token: Ref: AdminToken bootstack: + bootstrap_nodeid: + Fn::Select: + - 0 + - Fn::Select: + - 0 + - Merge::Map: + controller0: + - Fn::Select: + - name + - Fn::GetAtt: + - controller0 + - show public_interface_ip: Ref: NeutronPublicInterfaceIP + nodeid: {get_input: bootstack_nodeid} cinder: db: mysql://cinder:unset@localhost/cinder volume_size_mb: @@ -496,6 +509,12 @@ Resources: config: {Ref: controllerConfig} server: {Ref: controller0} input_values: + bootstack_nodeid: + Fn::Select: + - name + - Fn::GetAtt: + - controller0 + - show controller_host: Fn::Select: - 0 diff --git a/undercloud-source.yaml b/undercloud-source.yaml index 3cddb262..dd5d3855 100644 --- a/undercloud-source.yaml +++ b/undercloud-source.yaml @@ -154,6 +154,25 @@ Resources: Ref: AdminPassword admin-token: Ref: AdminToken + bootstack: + bootstrap_nodeid: + Fn::Select: + - 0 + - Fn::Select: + - 0 + - Merge::Map: + undercloud: + - Fn::Select: + - name + - Fn::GetAtt: + - undercloud + - show + nodeid: + Fn::Select: + - name + - Fn::GetAtt: + - undercloud + - show controller-address: Fn::Select: - 0 |