Code Review
/
apex-tripleo-heat-templates.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Permit overriding the undercloud controller ip.
[apex-tripleo-heat-templates.git]
/
undercloud-source.yaml
diff --git
a/undercloud-source.yaml
b/undercloud-source.yaml
index
3ac148c
..
9c49e65
100644
(file)
--- a/
undercloud-source.yaml
+++ b/
undercloud-source.yaml
@@
-15,6
+15,17
@@
Parameters:
Default: i386
Description: The architecture to use in Nova-BM - i386 or amd64.
Type: String
Default: i386
Description: The architecture to use in Nova-BM - i386 or amd64.
Type: String
+ ControllerAddress:
+ Default:
+ Fn::Select:
+ - 0
+ - Fn::Select:
+ - "ctlplane"
+ - Fn::GetAtt:
+ - undercloud
+ - networks
+ Description: The IP address for controller endpoints in config files.
+ Type: String
Flavor:
Default: baremetal
Description: Flavor to request when deploying.
Flavor:
Default: baremetal
Description: Flavor to request when deploying.
@@
-85,13
+96,7
@@
Resources:
admin-token:
Ref: AdminToken
controller-address:
admin-token:
Ref: AdminToken
controller-address:
- Fn::Select:
- - 0
- - Fn::Select:
- - "ctlplane"
- - Fn::GetAtt:
- - undercloud
- - networks
+ Ref: ControllerAddress
cinder:
db: mysql://cinder:unset@localhost/cinder
volume_size_mb: '5000'
cinder:
db: mysql://cinder:unset@localhost/cinder
volume_size_mb: '5000'
@@
-115,19
+120,19
@@
Resources:
Fn::Join:
- ''
- - http://
Fn::Join:
- ''
- - http://
- - {
"Fn::Select": [ 0, {"Fn::Select": [ "ctlplane", {"Fn::GetAtt": [ undercloud, networks ]} ]}]
}
+ - {
Ref: ControllerAddress
}
- ":8003"
metadata_server_url:
Fn::Join:
- ''
- - http://
- ":8003"
metadata_server_url:
Fn::Join:
- ''
- - http://
- - {
"Fn::Select": [ 0, {"Fn::Select": [ "ctlplane", {"Fn::GetAtt": [ undercloud, networks ]} ]}]
}
+ - {
Ref: ControllerAddress
}
- ":8000"
waitcondition_server_url:
Fn::Join:
- ''
- - http://
- ":8000"
waitcondition_server_url:
Fn::Join:
- ''
- - http://
- - {
"Fn::Select": [ 0, {"Fn::Select": [ "ctlplane", {"Fn::GetAtt": [ undercloud, networks ]} ]}]
}
+ - {
Ref: ControllerAddress
}
- ":8000/v1/waitcondition"
os-collect-config:
cfn:
- ":8000/v1/waitcondition"
os-collect-config:
cfn: