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
Big Switch Neutron ML2 plugin integration
[apex-tripleo-heat-templates.git]
/
base.yaml
diff --git
a/base.yaml
b/base.yaml
index
43ce7e6
..
a1ba509
100644
(file)
--- a/
base.yaml
+++ b/
base.yaml
@@
-1,18
+1,18
@@
-heat_template_version: 201
4-10-16
+heat_template_version: 201
3-05-23
description: 'Tie OpenStack components together'
parameters:
description: 'Tie OpenStack components together'
parameters:
- TemplateRoot:
- description: URL Base where all of our templates are available
- type: string
KeystoneAdminToken:
description: Admin Token needed for keystone
type: string
hidden: true
KeystoneAdminToken:
description: Admin Token needed for keystone
type: string
hidden: true
+ TemplateRoot:
+ description: URL Base where all of our templates are available
+ type: string
resources:
RabbitMQ:
type: AWS::CloudFormation::Stack
TemplateURL:
resources:
RabbitMQ:
type: AWS::CloudFormation::Stack
TemplateURL:
-
list_j
oin:
+
Fn::J
oin:
- {get_param: TemplateRoot}
- rabbitmq.yaml
parameters:
- {get_param: TemplateRoot}
- rabbitmq.yaml
parameters:
@@
-22,7
+22,7
@@
resources:
MySQL:
type: AWS::CloudFormation::Stack
TemplateURL:
MySQL:
type: AWS::CloudFormation::Stack
TemplateURL:
-
list_j
oin:
+
Fn::J
oin:
- {get_param: TemplateRoot}
- mysql.yaml
parameters:
- {get_param: TemplateRoot}
- mysql.yaml
parameters:
@@
-32,14
+32,14
@@
resources:
Keystone:
type: AWS::CloudFormation::Stack
TemplateURL:
Keystone:
type: AWS::CloudFormation::Stack
TemplateURL:
-
list_j
oin:
+
Fn::J
oin:
- {get_param: TemplateRoot}
- keystone.yaml
parameters:
AdminToken: {get_param: KeystoneAdminToken}
KeyName: default
KeystoneDSN:
- {get_param: TemplateRoot}
- keystone.yaml
parameters:
AdminToken: {get_param: KeystoneAdminToken}
KeyName: default
KeystoneDSN:
-
list_j
oin:
+
Fn::J
oin:
- 'mysql://keystone:'
- {get_attr: [ MySQL , KeystonePassword ]}
- '@'
- 'mysql://keystone:'
- {get_attr: [ MySQL , KeystonePassword ]}
- '@'
@@
-48,13
+48,13
@@
resources:
Glance:
type: AWS::CloudFormation::Stack
TemplateURL:
Glance:
type: AWS::CloudFormation::Stack
TemplateURL:
-
list_j
oin:
+
Fn::J
oin:
- {get_param: TemplateRoot}
- glance.yaml
parameters:
KeyName: default
HeatDSN:
- {get_param: TemplateRoot}
- glance.yaml
parameters:
KeyName: default
HeatDSN:
-
list_j
oin:
+
Fn::J
oin:
- 'mysql://glance:'
- {get_attr: [ MySQL, GlancePassword ] }
- '@'
- 'mysql://glance:'
- {get_attr: [ MySQL, GlancePassword ] }
- '@'
@@
-63,13
+63,13
@@
resources:
Heat:
type: AWS::CloudFormation::Stack
TemplateURL:
Heat:
type: AWS::CloudFormation::Stack
TemplateURL:
-
list_j
oin:
+
Fn::J
oin:
- {get_param: TemplateRoot}
- heat.yaml
parameters:
KeyName: default
HeatDSN:
- {get_param: TemplateRoot}
- heat.yaml
parameters:
KeyName: default
HeatDSN:
-
list_j
oin:
+
Fn::J
oin:
- 'mysql://heat:'
- {get_attr: [ MySQL, HeatPassword ] }
- '@'
- 'mysql://heat:'
- {get_attr: [ MySQL, HeatPassword ] }
- '@'