Use the server name attribute
The 'show' attribute results in a nova API call, which has performance overhead even with attribute memoization. The name attribute was added to expose the name without needing an API call, since the resource already knows the name. This change switches from using 'show' to 'name' throughout. Change-Id: I1e83dd008cd02e5cec97868db0d5a695f07b7199
This commit is contained in:
@@ -447,11 +447,9 @@ resources:
|
|||||||
- 0
|
- 0
|
||||||
- Merge::Map:
|
- Merge::Map:
|
||||||
controller0:
|
controller0:
|
||||||
- Fn::Select:
|
|
||||||
- name
|
|
||||||
- get_attr:
|
- get_attr:
|
||||||
- controller0
|
- controller0
|
||||||
- show
|
- name
|
||||||
nodeid: {get_input: bootstack_nodeid}
|
nodeid: {get_input: bootstack_nodeid}
|
||||||
database:
|
database:
|
||||||
host: &database_host
|
host: &database_host
|
||||||
@@ -533,7 +531,7 @@ resources:
|
|||||||
nodes:
|
nodes:
|
||||||
Merge::Map:
|
Merge::Map:
|
||||||
controller0:
|
controller0:
|
||||||
{get_attr: [controller0, show, name]}
|
{get_attr: [controller0, name]}
|
||||||
keystone:
|
keystone:
|
||||||
db:
|
db:
|
||||||
Fn::Join:
|
Fn::Join:
|
||||||
@@ -678,7 +676,7 @@ resources:
|
|||||||
Merge::Map:
|
Merge::Map:
|
||||||
controller0:
|
controller0:
|
||||||
ip: {get_attr: [controller0, networks, ctlplane, 0]}
|
ip: {get_attr: [controller0, networks, ctlplane, 0]}
|
||||||
name: {get_attr: [controller0, show, name]}
|
name: {get_attr: [controller0, name]}
|
||||||
net_binds:
|
net_binds:
|
||||||
- ip: {get_attr: [ControlVirtualIP, fixed_ips, 0, ip_address]}
|
- ip: {get_attr: [ControlVirtualIP, fixed_ips, 0, ip_address]}
|
||||||
services:
|
services:
|
||||||
@@ -778,7 +776,7 @@ resources:
|
|||||||
config: {get_resource: controllerConfig}
|
config: {get_resource: controllerConfig}
|
||||||
server: {get_resource: controller0}
|
server: {get_resource: controller0}
|
||||||
input_values:
|
input_values:
|
||||||
bootstack_nodeid: {get_attr: [controller0, show, name]}
|
bootstack_nodeid: {get_attr: [controller0, name]}
|
||||||
controller_host: {get_attr: [controller0, networks, ctlplane, 0]}
|
controller_host: {get_attr: [controller0, networks, ctlplane, 0]}
|
||||||
controller_virtual_ip:
|
controller_virtual_ip:
|
||||||
{get_attr: [ControlVirtualIP, fixed_ips, 0, ip_address]}
|
{get_attr: [ControlVirtualIP, fixed_ips, 0, ip_address]}
|
||||||
@@ -815,10 +813,10 @@ resources:
|
|||||||
Fn::Join:
|
Fn::Join:
|
||||||
- ' '
|
- ' '
|
||||||
- - {get_attr: [NovaCompute0, networks, ctlplane, 0]}
|
- - {get_attr: [NovaCompute0, networks, ctlplane, 0]}
|
||||||
- {get_attr: [NovaCompute0, show, name]}
|
- {get_attr: [NovaCompute0, name]}
|
||||||
- Fn::Join:
|
- Fn::Join:
|
||||||
- '.'
|
- '.'
|
||||||
- - {get_attr: [NovaCompute0, show, name]}
|
- - {get_attr: [NovaCompute0, name]}
|
||||||
- 'novalocal'
|
- 'novalocal'
|
||||||
- Fn::Join:
|
- Fn::Join:
|
||||||
- "\n"
|
- "\n"
|
||||||
@@ -827,10 +825,10 @@ resources:
|
|||||||
Fn::Join:
|
Fn::Join:
|
||||||
- ' '
|
- ' '
|
||||||
- - {get_attr: [BlockStorage0, networks, ctlplane, 0]}
|
- - {get_attr: [BlockStorage0, networks, ctlplane, 0]}
|
||||||
- {get_attr: [BlockStorage0, show, name]}
|
- {get_attr: [BlockStorage0, name]}
|
||||||
- Fn::Join:
|
- Fn::Join:
|
||||||
- '.'
|
- '.'
|
||||||
- - {get_attr: [BlockStorage0, show, name]}
|
- - {get_attr: [BlockStorage0, name]}
|
||||||
- 'novalocal'
|
- 'novalocal'
|
||||||
- Fn::Join:
|
- Fn::Join:
|
||||||
- "\n"
|
- "\n"
|
||||||
@@ -839,10 +837,10 @@ resources:
|
|||||||
Fn::Join:
|
Fn::Join:
|
||||||
- ' '
|
- ' '
|
||||||
- - {get_attr: [SwiftStorage0, networks, ctlplane, 0]}
|
- - {get_attr: [SwiftStorage0, networks, ctlplane, 0]}
|
||||||
- {get_attr: [SwiftStorage0, show, name]}
|
- {get_attr: [SwiftStorage0, name]}
|
||||||
- Fn::Join:
|
- Fn::Join:
|
||||||
- '.'
|
- '.'
|
||||||
- - {get_attr: [SwiftStorage0, show, name]}
|
- - {get_attr: [SwiftStorage0, name]}
|
||||||
- 'novalocal'
|
- 'novalocal'
|
||||||
- Fn::Join:
|
- Fn::Join:
|
||||||
- "\n"
|
- "\n"
|
||||||
@@ -851,10 +849,10 @@ resources:
|
|||||||
Fn::Join:
|
Fn::Join:
|
||||||
- ' '
|
- ' '
|
||||||
- - {get_attr: [controller0, networks, ctlplane, 0]}
|
- - {get_attr: [controller0, networks, ctlplane, 0]}
|
||||||
- {get_attr: [controller0, show, name]}
|
- {get_attr: [controller0, name]}
|
||||||
- Fn::Join:
|
- Fn::Join:
|
||||||
- '.'
|
- '.'
|
||||||
- - {get_attr: [controller0, show, name]}
|
- - {get_attr: [controller0, name]}
|
||||||
- 'novalocal'
|
- 'novalocal'
|
||||||
- {get_param: CloudName}
|
- {get_param: CloudName}
|
||||||
rabbit:
|
rabbit:
|
||||||
@@ -863,7 +861,7 @@ resources:
|
|||||||
- ','
|
- ','
|
||||||
- Merge::Map:
|
- Merge::Map:
|
||||||
controller0:
|
controller0:
|
||||||
{get_attr: [controller0, show, name]}
|
{get_attr: [controller0, name]}
|
||||||
controller0SSLDeployment:
|
controller0SSLDeployment:
|
||||||
type: OS::Heat::StructuredDeployment
|
type: OS::Heat::StructuredDeployment
|
||||||
properties:
|
properties:
|
||||||
|
@@ -230,11 +230,9 @@ resources:
|
|||||||
- 0
|
- 0
|
||||||
- Merge::Map:
|
- Merge::Map:
|
||||||
undercloud:
|
undercloud:
|
||||||
- Fn::Select:
|
|
||||||
- name
|
|
||||||
- get_attr:
|
- get_attr:
|
||||||
- undercloud
|
- undercloud
|
||||||
- show
|
- name
|
||||||
nodeid: {get_input: bootstack_nodeid}
|
nodeid: {get_input: bootstack_nodeid}
|
||||||
bootstack:
|
bootstack:
|
||||||
public_interface_ip:
|
public_interface_ip:
|
||||||
@@ -363,7 +361,6 @@ resources:
|
|||||||
bootstack_nodeid:
|
bootstack_nodeid:
|
||||||
get_attr:
|
get_attr:
|
||||||
- undercloud
|
- undercloud
|
||||||
- show
|
|
||||||
- name
|
- name
|
||||||
controller_host:
|
controller_host:
|
||||||
get_attr:
|
get_attr:
|
||||||
|
Reference in New Issue
Block a user