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 writing output to other than stdout.
[apex-tripleo-heat-templates.git]
/
undercloud-source.yaml
diff --git
a/undercloud-source.yaml
b/undercloud-source.yaml
index
9dca402
..
6431dfd
100644
(file)
--- a/
undercloud-source.yaml
+++ b/
undercloud-source.yaml
@@
-50,25
+50,34
@@
Resources:
AccessPolicy:
Properties:
AllowedResources:
AccessPolicy:
Properties:
AllowedResources:
- -
notcompute
Config
+ -
undercloud
Config
Type: OS::Heat::AccessPolicy
Key:
Properties:
UserName:
Ref: User
Type: AWS::IAM::AccessKey
Type: OS::Heat::AccessPolicy
Key:
Properties:
UserName:
Ref: User
Type: AWS::IAM::AccessKey
+ CompletionCondition:
+ Type: AWS::CloudFormation::WaitCondition
+ DependsOn: undercloud
+ Properties:
+ Handle: {Ref: CompletionHandle}
+ Count: '1'
+ Timeout: '1800'
+ CompletionHandle:
+ Type: AWS::CloudFormation::WaitConditionHandle
User:
Properties:
Policies:
- Ref: AccessPolicy
Type: AWS::IAM::User
User:
Properties:
Policies:
- Ref: AccessPolicy
Type: AWS::IAM::User
-
notcompute
Config:
+
undercloud
Config:
Type: AWS::AutoScaling::LaunchConfiguration
Properties:
ImageId: '0'
InstanceType: foo
Metadata:
Type: AWS::AutoScaling::LaunchConfiguration
Properties:
ImageId: '0'
InstanceType: foo
Metadata:
- OpenStack::Role:
notcompute
Config
+ OpenStack::Role:
undercloud
Config
OpenStack::Heat::Stack: {}
OpenStack::ImageBuilder::Elements: [ boot-stack, heat-cfntools, neutron-network-node ]
admin-password:
OpenStack::Heat::Stack: {}
OpenStack::ImageBuilder::Elements: [ boot-stack, heat-cfntools, neutron-network-node ]
admin-password:
@@
-81,11
+90,13
@@
Resources:
- Fn::Select:
- "ctlplane"
- Fn::GetAtt:
- Fn::Select:
- "ctlplane"
- Fn::GetAtt:
- -
notcompute
+ -
undercloud
- networks
cinder:
db: mysql://cinder:unset@localhost/cinder
volume_size_mb: '5000'
- networks
cinder:
db: mysql://cinder:unset@localhost/cinder
volume_size_mb: '5000'
+ completion-handle:
+ Ref: CompletionHandle
db-password: unset
glance:
backend: file
db-password: unset
glance:
backend: file
@@
-104,25
+115,25
@@
Resources:
Fn::Join:
- ''
- - http://
Fn::Join:
- ''
- - http://
- - {"Fn::Select": [ 0, {"Fn::Select": [ "ctlplane", {"Fn::GetAtt": [
notcompute
, networks ]} ]}]}
+ - {"Fn::Select": [ 0, {"Fn::Select": [ "ctlplane", {"Fn::GetAtt": [
undercloud
, networks ]} ]}]}
- ":8003"
metadata_server_url:
Fn::Join:
- ''
- - http://
- ":8003"
metadata_server_url:
Fn::Join:
- ''
- - http://
- - {"Fn::Select": [ 0, {"Fn::Select": [ "ctlplane", {"Fn::GetAtt": [
notcompute
, networks ]} ]}]}
+ - {"Fn::Select": [ 0, {"Fn::Select": [ "ctlplane", {"Fn::GetAtt": [
undercloud
, networks ]} ]}]}
- ":8000"
waitcondition_server_url:
Fn::Join:
- ''
- - http://
- ":8000"
waitcondition_server_url:
Fn::Join:
- ''
- - http://
- - {"Fn::Select": [ 0, {"Fn::Select": [ "ctlplane", {"Fn::GetAtt": [
notcompute
, networks ]} ]}]}
+ - {"Fn::Select": [ 0, {"Fn::Select": [ "ctlplane", {"Fn::GetAtt": [
undercloud
, networks ]} ]}]}
- ":8000/v1/waitcondition"
os-collect-config:
cfn:
access_key_id:
Ref: Key
- ":8000/v1/waitcondition"
os-collect-config:
cfn:
access_key_id:
Ref: Key
- path:
notcompute
Config.Metadata
+ path:
undercloud
Config.Metadata
secret_access_key:
Fn::GetAtt:
- Key
secret_access_key:
Fn::GetAtt:
- Key
@@
-150,7
+161,7
@@
Resources:
rabbit:
host: 127.0.0.1
password: guest
rabbit:
host: 127.0.0.1
password: guest
-
notcompute
:
+
undercloud
:
Type: OS::Nova::Server
Properties:
image:
Type: OS::Nova::Server
Properties:
image:
@@
-164,7
+175,7
@@
Resources:
cfn:
access_key_id:
Ref: Key
cfn:
access_key_id:
Ref: Key
- path:
notcompute
Config.Metadata
+ path:
undercloud
Config.Metadata
secret_access_key:
Fn::GetAtt:
- Key
secret_access_key:
Fn::GetAtt:
- Key