aboutsummaryrefslogtreecommitdiffstats
path: root/overcloud-source.yaml
diff options
context:
space:
mode:
Diffstat (limited to 'overcloud-source.yaml')
-rw-r--r--overcloud-source.yaml30
1 files changed, 14 insertions, 16 deletions
diff --git a/overcloud-source.yaml b/overcloud-source.yaml
index 3dbd5712..a9f39860 100644
--- a/overcloud-source.yaml
+++ b/overcloud-source.yaml
@@ -447,11 +447,9 @@ resources:
- 0
- Merge::Map:
controller0:
- - Fn::Select:
+ - get_attr:
+ - controller0
- name
- - get_attr:
- - controller0
- - show
nodeid: {get_input: bootstack_nodeid}
database:
host: &database_host
@@ -533,7 +531,7 @@ resources:
nodes:
Merge::Map:
controller0:
- {get_attr: [controller0, show, name]}
+ {get_attr: [controller0, name]}
keystone:
db:
Fn::Join:
@@ -678,7 +676,7 @@ resources:
Merge::Map:
controller0:
ip: {get_attr: [controller0, networks, ctlplane, 0]}
- name: {get_attr: [controller0, show, name]}
+ name: {get_attr: [controller0, name]}
net_binds:
- ip: {get_attr: [ControlVirtualIP, fixed_ips, 0, ip_address]}
services:
@@ -778,7 +776,7 @@ resources:
config: {get_resource: controllerConfig}
server: {get_resource: controller0}
input_values:
- bootstack_nodeid: {get_attr: [controller0, show, name]}
+ bootstack_nodeid: {get_attr: [controller0, name]}
controller_host: {get_attr: [controller0, networks, ctlplane, 0]}
controller_virtual_ip:
{get_attr: [ControlVirtualIP, fixed_ips, 0, ip_address]}
@@ -815,10 +813,10 @@ resources:
Fn::Join:
- ' '
- - {get_attr: [NovaCompute0, networks, ctlplane, 0]}
- - {get_attr: [NovaCompute0, show, name]}
+ - {get_attr: [NovaCompute0, name]}
- Fn::Join:
- '.'
- - - {get_attr: [NovaCompute0, show, name]}
+ - - {get_attr: [NovaCompute0, name]}
- 'novalocal'
- Fn::Join:
- "\n"
@@ -827,10 +825,10 @@ resources:
Fn::Join:
- ' '
- - {get_attr: [BlockStorage0, networks, ctlplane, 0]}
- - {get_attr: [BlockStorage0, show, name]}
+ - {get_attr: [BlockStorage0, name]}
- Fn::Join:
- '.'
- - - {get_attr: [BlockStorage0, show, name]}
+ - - {get_attr: [BlockStorage0, name]}
- 'novalocal'
- Fn::Join:
- "\n"
@@ -839,10 +837,10 @@ resources:
Fn::Join:
- ' '
- - {get_attr: [SwiftStorage0, networks, ctlplane, 0]}
- - {get_attr: [SwiftStorage0, show, name]}
+ - {get_attr: [SwiftStorage0, name]}
- Fn::Join:
- '.'
- - - {get_attr: [SwiftStorage0, show, name]}
+ - - {get_attr: [SwiftStorage0, name]}
- 'novalocal'
- Fn::Join:
- "\n"
@@ -851,10 +849,10 @@ resources:
Fn::Join:
- ' '
- - {get_attr: [controller0, networks, ctlplane, 0]}
- - {get_attr: [controller0, show, name]}
+ - {get_attr: [controller0, name]}
- Fn::Join:
- '.'
- - - {get_attr: [controller0, show, name]}
+ - - {get_attr: [controller0, name]}
- 'novalocal'
- {get_param: CloudName}
rabbit:
@@ -863,7 +861,7 @@ resources:
- ','
- Merge::Map:
controller0:
- {get_attr: [controller0, show, name]}
+ {get_attr: [controller0, name]}
controller0SSLDeployment:
type: OS::Heat::StructuredDeployment
properties: