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
Parametrize Swift partition power
[apex-tripleo-heat-templates.git]
/
base.yaml
diff --git
a/base.yaml
b/base.yaml
index
f1e8967
..
9c2e4e2
100644
(file)
--- a/
base.yaml
+++ b/
base.yaml
@@
-1,77
+1,77
@@
-HeatTemplateFormatVersion: '2012-12-12'
-
D
escription: 'Tie OpenStack components together'
-
P
arameters:
+heat_template_version: 2013-05-23
+
d
escription: 'Tie OpenStack components together'
+
p
arameters:
TemplateRoot:
TemplateRoot:
-
D
escription: URL Base where all of our templates are available
-
Type: S
tring
+
d
escription: URL Base where all of our templates are available
+
type: s
tring
KeystoneAdminToken:
KeystoneAdminToken:
-
D
escription: Admin Token needed for keystone
-
Type: S
tring
-
NoEcho
: true
-
R
esources:
+
d
escription: Admin Token needed for keystone
+
type: s
tring
+
hidden
: true
+
r
esources:
RabbitMQ:
RabbitMQ:
-
T
ype: AWS::CloudFormation::Stack
+
t
ype: AWS::CloudFormation::Stack
TemplateURL:
Fn::Join:
TemplateURL:
Fn::Join:
- - {
Ref
: TemplateRoot}
+ - {
get_param
: TemplateRoot}
- rabbitmq.yaml
- rabbitmq.yaml
-
P
arameters:
+
p
arameters:
InstanceType: m1.small
KeyName: default
RabbitMQImage: image-rabbitmq
MySQL:
InstanceType: m1.small
KeyName: default
RabbitMQImage: image-rabbitmq
MySQL:
-
T
ype: AWS::CloudFormation::Stack
+
t
ype: AWS::CloudFormation::Stack
TemplateURL:
Fn::Join:
TemplateURL:
Fn::Join:
- - {
Ref
: TemplateRoot}
+ - {
get_param
: TemplateRoot}
- mysql.yaml
- mysql.yaml
-
P
arameters:
+
p
arameters:
InstanceType: m1.small
KeyName: default
MySQLImage: image-mysql
Keystone:
InstanceType: m1.small
KeyName: default
MySQLImage: image-mysql
Keystone:
-
T
ype: AWS::CloudFormation::Stack
+
t
ype: AWS::CloudFormation::Stack
TemplateURL:
Fn::Join:
TemplateURL:
Fn::Join:
- - {
Ref
: TemplateRoot}
+ - {
get_param
: TemplateRoot}
- keystone.yaml
- keystone.yaml
-
P
arameters:
- AdminToken: {
Ref
: KeystoneAdminToken}
+
p
arameters:
+ AdminToken: {
get_param
: KeystoneAdminToken}
KeyName: default
KeystoneDSN:
Fn::Join:
- 'mysql://keystone:'
KeyName: default
KeystoneDSN:
Fn::Join:
- 'mysql://keystone:'
- - {
"Fn::GetAtt"
: [ MySQL , KeystonePassword ]}
+ - {
get_attr
: [ MySQL , KeystonePassword ]}
- '@'
- '@'
- - {
"Fn::GetAtt"
: [ MySQL , MySQLHost ]}
+ - {
get_attr
: [ MySQL , MySQLHost ]}
- '/keystone'
Glance:
- '/keystone'
Glance:
-
T
ype: AWS::CloudFormation::Stack
+
t
ype: AWS::CloudFormation::Stack
TemplateURL:
Fn::Join:
TemplateURL:
Fn::Join:
- - {
Ref
: TemplateRoot}
+ - {
get_param
: TemplateRoot}
- glance.yaml
- glance.yaml
-
P
arameters:
+
p
arameters:
KeyName: default
HeatDSN:
Fn::Join:
- 'mysql://glance:'
KeyName: default
HeatDSN:
Fn::Join:
- 'mysql://glance:'
- - {
"Fn::GetAtt"
: [ MySQL, GlancePassword ] }
+ - {
get_attr
: [ MySQL, GlancePassword ] }
- '@'
- '@'
- - {
"Fn::GetAtt"
: [ MySQL, MySQLHost ]}
+ - {
get_attr
: [ MySQL, MySQLHost ]}
- '/glance'
Heat:
- '/glance'
Heat:
-
T
ype: AWS::CloudFormation::Stack
+
t
ype: AWS::CloudFormation::Stack
TemplateURL:
Fn::Join:
TemplateURL:
Fn::Join:
- - {
Ref
: TemplateRoot}
+ - {
get_param
: TemplateRoot}
- heat.yaml
- heat.yaml
-
P
arameters:
+
p
arameters:
KeyName: default
HeatDSN:
Fn::Join:
- 'mysql://heat:'
KeyName: default
HeatDSN:
Fn::Join:
- 'mysql://heat:'
- - {
"Fn::GetAtt"
: [ MySQL, HeatPassword ] }
+ - {
get_attr
: [ MySQL, HeatPassword ] }
- '@'
- '@'
- - {
"Fn::GetAtt"
: [ MySQL, MySQLHost ]}
+ - {
get_attr
: [ MySQL, MySQLHost ]}
- '/heat'
- '/heat'