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]
/
notcompute.yaml
diff --git
a/notcompute.yaml
b/notcompute.yaml
index
2e598c0
..
ef33936
100644
(file)
--- a/
notcompute.yaml
+++ b/
notcompute.yaml
@@
-1,4
+1,4
@@
-Description: Nova API,Keystone,Heat Engine and API,Glance,
Quantum
,Dedicated MySQL
+Description: Nova API,Keystone,Heat Engine and API,Glance,
Neutron
,Dedicated MySQL
server,Dedicated RabbitMQ Server
HeatTemplateFormatVersion: '2012-12-12'
Parameters:
server,Dedicated RabbitMQ Server
HeatTemplateFormatVersion: '2012-12-12'
Parameters:
@@
-8,6
+8,7
@@
Parameters:
Default: ''
Description: Password to use for mysqldump from Bootstrap Host
Type: String
Default: ''
Description: Password to use for mysqldump from Bootstrap Host
Type: String
+ NoEcho: true
BootstrapHost:
Default: ''
Description: Load mysqldump from this Host
BootstrapHost:
Default: ''
Description: Load mysqldump from this Host
@@
-16,10
+17,12
@@
Parameters:
Default: ''
Description: Root password for localhost access after bootstrap
Type: String
Default: ''
Description: Root password for localhost access after bootstrap
Type: String
+ NoEcho: true
BootstrapSlavePassword:
Default: ''
Description: Password to use with BootstrapSlaveUser
Type: String
BootstrapSlavePassword:
Default: ''
Description: Password to use with BootstrapSlaveUser
Type: String
+ NoEcho: true
BootstrapSlaveUser:
Default: ''
Description: User to use for replication from bootstrap host
BootstrapSlaveUser:
Default: ''
Description: User to use for replication from bootstrap host
@@
-27,9
+30,11
@@
Parameters:
GlanceDBPassword:
Description: Password for connecting to glance database
Type: String
GlanceDBPassword:
Description: Password for connecting to glance database
Type: String
+ NoEcho: true
HeatDBPassword:
Description: Password for accessing Heat database.
Type: String
HeatDBPassword:
Description: Password for accessing Heat database.
Type: String
+ NoEcho: true
InstanceType:
Default: baremetal
Description: Use this flavor
InstanceType:
Default: baremetal
Description: Use this flavor
@@
-41,26
+46,32
@@
Parameters:
KeystoneDBPassword:
Description: Password for connecting to keystone
Type: String
KeystoneDBPassword:
Description: Password for connecting to keystone
Type: String
+ NoEcho: true
NovaDBPassword:
Description: Password for connecting to nova database
Type: String
NovaDBPassword:
Description: Password for connecting to nova database
Type: String
+ NoEcho: true
NovaInterfaces:
Default: eth0
Type: String
NovaInterfaces:
Default: eth0
Type: String
-
Quantum
DBPassword:
- Description: Password for connecting to
quantum
database
+
Neutron
DBPassword:
+ Description: Password for connecting to
neutron
database
Type: String
Type: String
- QuantumInterfaces:
+ NoEcho: true
+ NeutronInterfaces:
Default: eth0
Type: String
RabbitMQPassword:
Description: Password for RabbitMQ
Type: String
Default: eth0
Type: String
RabbitMQPassword:
Description: Password for RabbitMQ
Type: String
+ NoEcho: true
RabbitPassword:
Type: String
RabbitPassword:
Type: String
+ NoEcho: true
ServicePassword:
Description: admin_password for setting up auth in nova.
Type: String
ServicePassword:
Description: admin_password for setting up auth in nova.
Type: String
+ NoEcho: true
notcomputeImage:
Type: String
Resources:
notcomputeImage:
Type: String
Resources:
@@
-107,9
+118,9
@@
Resources:
- database: nova
username: nova
password: {Ref: NovaDBPassword}
- database: nova
username: nova
password: {Ref: NovaDBPassword}
- - database:
quantum
- username:
quantum
- password: {Ref:
Quantum
DBPassword}
+ - database:
neutron
+ username:
neutron
+ password: {Ref:
Neutron
DBPassword}
glance:
db:
Fn::Join:
glance:
db:
Fn::Join:
@@
-157,15
+168,15
@@
Resources:
- - 'mysql://nova:'
- {Ref: NovaDBPassword}
- '@127.0.0.1/nova'
- - 'mysql://nova:'
- {Ref: NovaDBPassword}
- '@127.0.0.1/nova'
-
quantum
:
+
neutron
:
host:
'127.0.0.1'
ovs_db:
Fn::Join:
- ''
host:
'127.0.0.1'
ovs_db:
Fn::Join:
- ''
- - - 'mysql://
quantum
:'
- - {Ref:
Quantum
DBPassword}
- - '@127.0.0.1/ovs_
quantum
'
+ - - 'mysql://
neutron
:'
+ - {Ref:
Neutron
DBPassword}
+ - '@127.0.0.1/ovs_
neutron
'
rabbit:
host:
'127.0.0.1'
rabbit:
host:
'127.0.0.1'