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
Add recursive whole-file __include__ tag
[apex-tripleo-heat-templates.git]
/
undercloud-vm.yaml
diff --git
a/undercloud-vm.yaml
b/undercloud-vm.yaml
index
b9cf0ec
..
8c948ca
100644
(file)
--- a/
undercloud-vm.yaml
+++ b/
undercloud-vm.yaml
@@
-5,10
+5,15
@@
Parameters:
Default: unset
Description: The password for the keystone admin account, used for monitoring, querying neutron etc.
Type: String
Default: unset
Description: The password for the keystone admin account, used for monitoring, querying neutron etc.
Type: String
+ NoEcho: true
AdminToken:
Default: unset
Description: The keystone auth secret.
Type: String
AdminToken:
Default: unset
Description: The keystone auth secret.
Type: String
+ BaremetalArch:
+ Default: i386
+ Description: The architecture to use in Nova-BM - i386 or amd64.
+ Type: String
Flavor:
Default: baremetal
Description: Flavor to request when deploying.
Flavor:
Default: baremetal
Description: Flavor to request when deploying.
@@
-17,6
+22,7
@@
Parameters:
Default: unset
Description: The password for the glance service account, used by the glance services.
Type: String
Default: unset
Description: The password for the glance service account, used by the glance services.
Type: String
+ NoEcho: true
KeyName:
Default: default
Description: Name of an existing EC2 KeyPair to enable SSH access to the instances
KeyName:
Default: default
Description: Name of an existing EC2 KeyPair to enable SSH access to the instances
@@
-25,6
+31,7
@@
Parameters:
Default: unset
Description: The password for the Heat service account, used by the Heat services.
Type: String
Default: unset
Description: The password for the Heat service account, used by the Heat services.
Type: String
+ NoEcho: true
Image:
Default: undercloud
Type: String
Image:
Default: undercloud
Type: String
@@
-32,10
+39,16
@@
Parameters:
Default: unset
Description: The password for the neutron service account, used by neutron agents.
Type: String
Default: unset
Description: The password for the neutron service account, used by neutron agents.
Type: String
+ NoEcho: true
+ NeutronNativePXE:
+ Default: ''
+ Type: String
+ Description: Set truthy to enable Neutron native PXE.
NovaPassword:
Default: unset
Description: The password for the nova service account, used by nova-api.
Type: String
NovaPassword:
Default: unset
Description: The password for the nova service account, used by nova-api.
Type: String
+ NoEcho: true
PowerUserName:
Default: stack
Description: What username to ssh to the virtual power host with.
PowerUserName:
Default: stack
Description: What username to ssh to the virtual power host with.
@@
-69,9
+82,13
@@
Resources:
admin-token:
Ref: AdminToken
controller-address:
admin-token:
Ref: AdminToken
controller-address:
- Fn::GetAtt:
- - notcompute
- - PrivateIp
+ Fn::Select:
+ - 0
+ - Fn::Select:
+ - "ctlplane"
+ - Fn::GetAtt:
+ - notcompute
+ - networks
cinder:
db: mysql://cinder:unset@localhost/cinder
volume_size_mb: '5000'
cinder:
db: mysql://cinder:unset@localhost/cinder
volume_size_mb: '5000'
@@
-92,19
+109,19
@@
Resources:
Fn::Join:
- ''
- - http://
Fn::Join:
- ''
- - http://
- - {"Fn::
GetAtt": [ notcompute, PrivateIp
]}
+ - {"Fn::
Select": [ 0, {"Fn::Select": [ "ctlplane", {"Fn::GetAtt": [ notcompute, networks ]} ]}
]}
- ":8003"
metadata_server_url:
Fn::Join:
- ''
- - http://
- ":8003"
metadata_server_url:
Fn::Join:
- ''
- - http://
- - {"Fn::
GetAtt": [ notcompute, PrivateIp
]}
+ - {"Fn::
Select": [ 0, {"Fn::Select": [ "ctlplane", {"Fn::GetAtt": [ notcompute, networks ]} ]}
]}
- ":8000"
waitcondition_server_url:
Fn::Join:
- ''
- - http://
- ":8000"
waitcondition_server_url:
Fn::Join:
- ''
- - http://
- - {"Fn::
GetAtt": [ notcompute, PrivateIp
]}
+ - {"Fn::
Select": [ 0, {"Fn::Select": [ "ctlplane", {"Fn::GetAtt": [ notcompute, networks ]} ]}
]}
- ":8000/v1/waitcondition"
os-collect-config:
cfn:
- ":8000/v1/waitcondition"
os-collect-config:
cfn:
@@
-123,7
+140,7
@@
Resources:
db: mysql://keystone:unset@localhost/keystone
host: 127.0.0.1
nova:
db: mysql://keystone:unset@localhost/keystone
host: 127.0.0.1
nova:
- compute_hostname: u
buntu
+ compute_hostname: u
ndercloud
compute_driver: baremetal.driver.BareMetalDriver
db: mysql://nova:unset@localhost/nova
host: 127.0.0.1
compute_driver: baremetal.driver.BareMetalDriver
db: mysql://nova:unset@localhost/nova
host: 127.0.0.1
@@
-132,7
+149,8
@@
Resources:
ram_allocation_ratio: 1.0
reserved_host_memory_mb: 0
baremetal:
ram_allocation_ratio: 1.0
reserved_host_memory_mb: 0
baremetal:
- arch: i386
+ arch:
+ Ref: BaremetalArch
db: mysql://nova:unset@localhost/nova_bm
power_manager: nova.virt.baremetal.virtual_power_driver.VirtualPowerManager
pxe_deploy_timeout: 2400
db: mysql://nova:unset@localhost/nova_bm
power_manager: nova.virt.baremetal.virtual_power_driver.VirtualPowerManager
pxe_deploy_timeout: 2400
@@
-146,6
+164,8
@@
Resources:
Ref: NovaPassword
neutron:
host: 127.0.0.1
Ref: NovaPassword
neutron:
host: 127.0.0.1
+ native_pxe:
+ Ref: NeutronNativePXE
ovs_db: mysql://neutron:unset@localhost/ovs_neutron?charset=utf8
ovs:
dnsmasq_range: [192.0.2.25, 192.0.2.44]
ovs_db: mysql://neutron:unset@localhost/ovs_neutron?charset=utf8
ovs:
dnsmasq_range: [192.0.2.25, 192.0.2.44]