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
Drop dnsmasq_range from the undercloud source.
[apex-tripleo-heat-templates.git]
/
notcompute.yaml
diff --git
a/notcompute.yaml
b/notcompute.yaml
index
fe66f3b
..
5a4d9d2
100644
(file)
--- a/
notcompute.yaml
+++ b/
notcompute.yaml
@@
-31,6
+31,14
@@
Parameters:
Description: Password for connecting to glance database
Type: String
NoEcho: true
Description: Password for connecting to glance database
Type: String
NoEcho: true
+ GlanceNotifierStrategy:
+ Description: Strategy to use for Glance notification queue
+ Type: String
+ Default: noop
+ GlanceLogFile:
+ Description: The filepath of the file to use for logging messages from Glance.
+ Type: String
+ Default: ''
HeatDBPassword:
Description: Password for accessing Heat database.
Type: String
HeatDBPassword:
Description: Password for accessing Heat database.
Type: String
@@
-65,6
+73,8
@@
Parameters:
Description: Password for RabbitMQ
Type: String
NoEcho: true
Description: Password for RabbitMQ
Type: String
NoEcho: true
+ RabbitUserName:
+ Type: String
RabbitPassword:
Type: String
NoEcho: true
RabbitPassword:
Type: String
NoEcho: true
@@
-74,6
+84,11
@@
Parameters:
NoEcho: true
notcomputeImage:
Type: String
NoEcho: true
notcomputeImage:
Type: String
+ HeatStackDomainAdminPassword:
+ Description: Password for heat_domain_admin user.
+ Type: String
+ Default: ''
+ NoEcho: true
Resources:
AccessPolicy:
Properties:
Resources:
AccessPolicy:
Properties:
@@
-128,6
+143,10
@@
Resources:
- - 'mysql://glance:'
- {Ref: GlanceDBPassword}
- '@127.0.0.1/glance'
- - 'mysql://glance:'
- {Ref: GlanceDBPassword}
- '@127.0.0.1/glance'
+ notifier-strategy:
+ Ref: GlanceNotifierStrategy
+ log-file:
+ Ref: GlanceLogFile
heat:
db:
Fn::Join:
heat:
db:
Fn::Join:
@@
-149,6
+168,7
@@
Resources:
region:
Ref: AWS::Region
auth_encryption_key: unset
region:
Ref: AWS::Region
auth_encryption_key: unset
+ stack_domain_admin_password: {Ref: HeatStackDomainAdminPassword}
interfaces:
control:
Ref: NovaInterfaces
interfaces:
control:
Ref: NovaInterfaces
@@
-180,12
+200,19
@@
Resources:
rabbit:
host:
'127.0.0.1'
rabbit:
host:
'127.0.0.1'
+ username:
+ Ref: RabbitUserName
password:
Ref: RabbitPassword
users:
password:
Ref: RabbitPassword
users:
- username: guest
+ username:
+ Ref: RabbitUserName
password:
Ref: RabbitPassword
password:
Ref: RabbitPassword
+ cookie:
+ Fn::GetAtt:
+ - RabbitCookie
+ - value
service-password:
Ref: ServicePassword
Properties:
service-password:
Ref: ServicePassword
Properties: