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
Merge "Merge Block Storage into Overcloud"
[apex-tripleo-heat-templates.git]
/
notcompute.yaml
diff --git
a/notcompute.yaml
b/notcompute.yaml
index
ef33936
..
2ad5b30
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
@@
-78,9
+88,9
@@
Resources:
AccessPolicy:
Properties:
AllowedResources:
AccessPolicy:
Properties:
AllowedResources:
- - not
compute
+ - not
Compute0
Type: OS::Heat::AccessPolicy
Type: OS::Heat::AccessPolicy
- Key:
+
notCompute0
Key:
Properties:
UserName:
Ref: User
Properties:
UserName:
Ref: User
@@
-90,7
+100,7
@@
Resources:
Policies:
- Ref: AccessPolicy
Type: AWS::IAM::User
Policies:
- Ref: AccessPolicy
Type: AWS::IAM::User
- not
compute
:
+ not
Compute0
:
Metadata:
OpenStack::ImageBuilder::Elements:
- nova-api
Metadata:
OpenStack::ImageBuilder::Elements:
- nova-api
@@
-128,6
+138,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:
@@
-136,12
+150,12
@@
Resources:
- {Ref: HeatDBPassword}
- '@127.0.0.1/heat'
access_key_id:
- {Ref: HeatDBPassword}
- '@127.0.0.1/heat'
access_key_id:
- Ref: Key
+ Ref:
notCompute0
Key
refresh:
refresh:
- - resource: not
compute
+ - resource: not
Compute0
secret_key:
Fn::GetAtt:
secret_key:
Fn::GetAtt:
- - Key
+ -
notCompute0
Key
- SecretAccessKey
stack:
name:
- SecretAccessKey
stack:
name:
@@
-180,12
+194,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: