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
Use the server name attribute
[apex-tripleo-heat-templates.git]
/
controller.yaml
diff --git
a/controller.yaml
b/controller.yaml
index
758778d
..
8aac819
100644
(file)
--- a/
controller.yaml
+++ b/
controller.yaml
@@
-1,177
+1,169
@@
-
D
escription: Nova API,Keystone,Heat Engine and API,Glance,Neutron,Dedicated MySQL
+
d
escription: Nova API,Keystone,Heat Engine and API,Glance,Neutron,Dedicated MySQL
server,Dedicated RabbitMQ Server
server,Dedicated RabbitMQ Server
-HeatTemplateFormatVersion: '2012-12-12'
-
P
arameters:
+heat_template_version: 2013-05-23
+
p
arameters:
AdminToken:
AdminToken:
-
Type: S
tring
+
type: s
tring
BootstrapDumpPassword:
BootstrapDumpPassword:
-
D
efault: ''
-
D
escription: Password to use for mysqldump from Bootstrap Host
-
Type: S
tring
-
NoEcho
: true
+
d
efault: ''
+
d
escription: Password to use for mysqldump from Bootstrap Host
+
type: s
tring
+
hidden
: true
BootstrapHost:
BootstrapHost:
-
D
efault: ''
-
D
escription: Load mysqldump from this Host
-
Type: S
tring
+
d
efault: ''
+
d
escription: Load mysqldump from this Host
+
type: s
tring
BootstrapRootPassword:
BootstrapRootPassword:
-
D
efault: ''
-
D
escription: Root password for localhost access after bootstrap
-
Type: S
tring
-
NoEcho
: true
+
d
efault: ''
+
d
escription: Root password for localhost access after bootstrap
+
type: s
tring
+
hidden
: true
BootstrapSlavePassword:
BootstrapSlavePassword:
-
D
efault: ''
-
D
escription: Password to use with BootstrapSlaveUser
-
Type: S
tring
-
NoEcho
: true
+
d
efault: ''
+
d
escription: Password to use with BootstrapSlaveUser
+
type: s
tring
+
hidden
: true
BootstrapSlaveUser:
BootstrapSlaveUser:
-
D
efault: ''
-
D
escription: User to use for replication from bootstrap host
-
Type: S
tring
+
d
efault: ''
+
d
escription: User to use for replication from bootstrap host
+
type: s
tring
GlanceDBPassword:
GlanceDBPassword:
-
D
escription: Password for connecting to glance database
-
Type: S
tring
-
NoEcho
: true
+
d
escription: Password for connecting to glance database
+
type: s
tring
+
hidden
: true
GlanceNotifierStrategy:
GlanceNotifierStrategy:
-
D
escription: Strategy to use for Glance notification queue
-
Type: S
tring
-
D
efault: noop
+
d
escription: Strategy to use for Glance notification queue
+
type: s
tring
+
d
efault: noop
GlanceLogFile:
GlanceLogFile:
-
D
escription: The filepath of the file to use for logging messages from Glance.
-
Type: S
tring
-
D
efault: ''
+
d
escription: The filepath of the file to use for logging messages from Glance.
+
type: s
tring
+
d
efault: ''
HeatDBPassword:
HeatDBPassword:
-
D
escription: Password for accessing Heat database.
-
Type: S
tring
-
NoEcho
: true
+
d
escription: Password for accessing Heat database.
+
type: s
tring
+
hidden
: true
InstanceType:
InstanceType:
-
D
efault: baremetal
-
D
escription: Use this flavor
-
Type: S
tring
+
d
efault: baremetal
+
d
escription: Use this flavor
+
type: s
tring
KeyName:
KeyName:
-
D
efault: default
-
D
escription: Name of an existing EC2 KeyPair to enable SSH access to the instances
-
Type: S
tring
+
d
efault: default
+
d
escription: Name of an existing EC2 KeyPair to enable SSH access to the instances
+
type: s
tring
KeystoneDBPassword:
KeystoneDBPassword:
-
D
escription: Password for connecting to keystone
-
Type: S
tring
-
NoEcho
: true
+
d
escription: Password for connecting to keystone
+
type: s
tring
+
hidden
: true
NovaDBPassword:
NovaDBPassword:
-
D
escription: Password for connecting to nova database
-
Type: S
tring
-
NoEcho
: true
+
d
escription: Password for connecting to nova database
+
type: s
tring
+
hidden
: true
NovaInterfaces:
NovaInterfaces:
-
D
efault: eth0
-
Type: S
tring
+
d
efault: eth0
+
type: s
tring
NeutronDBPassword:
NeutronDBPassword:
-
D
escription: Password for connecting to neutron database
-
Type: S
tring
-
NoEcho
: true
+
d
escription: Password for connecting to neutron database
+
type: s
tring
+
hidden
: true
NeutronInterfaces:
NeutronInterfaces:
-
D
efault: eth0
-
Type: S
tring
+
d
efault: eth0
+
type: s
tring
RabbitMQPassword:
RabbitMQPassword:
-
D
escription: Password for RabbitMQ
-
Type: S
tring
-
NoEcho
: true
+
d
escription: Password for RabbitMQ
+
type: s
tring
+
hidden
: true
RabbitUserName:
RabbitUserName:
-
Type: S
tring
+
type: s
tring
RabbitPassword:
RabbitPassword:
-
Type: S
tring
-
NoEcho
: true
+
type: s
tring
+
hidden
: true
ServicePassword:
ServicePassword:
-
D
escription: admin_password for setting up auth in nova.
-
Type: S
tring
-
NoEcho
: true
+
d
escription: admin_password for setting up auth in nova.
+
type: s
tring
+
hidden
: true
controllerImage:
controllerImage:
-
Type: S
tring
+
type: s
tring
HeatStackDomainAdminPassword:
HeatStackDomainAdminPassword:
-
D
escription: Password for heat_domain_admin user.
-
Type: S
tring
-
D
efault: ''
-
NoEcho
: true
-
R
esources:
+
d
escription: Password for heat_domain_admin user.
+
type: s
tring
+
d
efault: ''
+
hidden
: true
+
r
esources:
AccessPolicy:
AccessPolicy:
-
P
roperties:
+
p
roperties:
AllowedResources:
- controller0
AllowedResources:
- controller0
-
T
ype: OS::Heat::AccessPolicy
+
t
ype: OS::Heat::AccessPolicy
controller0Key:
controller0Key:
-
P
roperties:
+
p
roperties:
UserName:
UserName:
-
Ref
: User
-
T
ype: AWS::IAM::AccessKey
+
get_resource
: User
+
t
ype: AWS::IAM::AccessKey
User:
User:
-
P
roperties:
+
p
roperties:
Policies:
Policies:
- -
Ref
: AccessPolicy
-
T
ype: AWS::IAM::User
+ -
get_resource
: AccessPolicy
+
t
ype: AWS::IAM::User
controller0:
controller0:
- Metadata:
- OpenStack::ImageBuilder::Elements:
- - nova-api
- - keystone
- - heat-api
- - heat-engine
- - glance
- - mysql-migration
- - rabbitmq-server
+ metadata:
admin-password:
admin-password:
-
Ref
: ServicePassword
+
get_param
: ServicePassword
admin-token:
admin-token:
-
Ref
: AdminToken
+
get_param
: AdminToken
mysql:
create-users:
- database: keystone
username: keystone
mysql:
create-users:
- database: keystone
username: keystone
- password: {
Ref
: KeystoneDBPassword}
+ password: {
get_param
: KeystoneDBPassword}
- database: heat
username: heat
- database: heat
username: heat
- password: {
Ref
: HeatDBPassword}
+ password: {
get_param
: HeatDBPassword}
- database: glance
username: glance
- database: glance
username: glance
- password: {
Ref
: GlanceDBPassword}
+ password: {
get_param
: GlanceDBPassword}
- database: nova
username: nova
- database: nova
username: nova
- password: {
Ref
: NovaDBPassword}
+ password: {
get_param
: NovaDBPassword}
- database: neutron
username: neutron
- database: neutron
username: neutron
- password: {
Ref
: NeutronDBPassword}
+ password: {
get_param
: NeutronDBPassword}
glance:
db:
Fn::Join:
- ''
- - 'mysql://glance:'
glance:
db:
Fn::Join:
- ''
- - 'mysql://glance:'
- - {
Ref
: GlanceDBPassword}
+ - {
get_param
: GlanceDBPassword}
- '@127.0.0.1/glance'
notifier-strategy:
- '@127.0.0.1/glance'
notifier-strategy:
-
Ref
: GlanceNotifierStrategy
+
get_param
: GlanceNotifierStrategy
log-file:
log-file:
-
Ref
: GlanceLogFile
+
get_param
: GlanceLogFile
heat:
db:
Fn::Join:
- ''
- - 'mysql://heat:'
heat:
db:
Fn::Join:
- ''
- - 'mysql://heat:'
- - {
Ref
: HeatDBPassword}
+ - {
get_param
: HeatDBPassword}
- '@127.0.0.1/heat'
access_key_id:
- '@127.0.0.1/heat'
access_key_id:
-
Ref
: controller0Key
+
get_resource
: controller0Key
refresh:
- resource: controller0
secret_key:
refresh:
- resource: controller0
secret_key:
-
Fn::GetAtt
:
+
get_attr
:
- controller0Key
- SecretAccessKey
stack:
name:
- controller0Key
- SecretAccessKey
stack:
name:
-
Ref
: AWS::StackName
+
get_param
: AWS::StackName
region:
region:
-
Ref
: AWS::Region
+
get_param
: AWS::Region
auth_encryption_key: unset
auth_encryption_key: unset
- stack_domain_admin_password: {
Ref
: HeatStackDomainAdminPassword}
+ stack_domain_admin_password: {
get_param
: HeatStackDomainAdminPassword}
interfaces:
control:
interfaces:
control:
-
Ref
: NovaInterfaces
+
get_param
: NovaInterfaces
keystone:
host:
'127.0.0.1'
keystone:
host:
'127.0.0.1'
@@
-179,14
+171,14
@@
Resources:
Fn::Join:
- ''
- - 'mysql://keystone:'
Fn::Join:
- ''
- - 'mysql://keystone:'
- - {
Ref
: KeystoneDBPassword}
+ - {
get_param
: KeystoneDBPassword}
- '@127.0.0.1/keystone'
nova:
db:
Fn::Join:
- ''
- - 'mysql://nova:'
- '@127.0.0.1/keystone'
nova:
db:
Fn::Join:
- ''
- - 'mysql://nova:'
- - {
Ref
: NovaDBPassword}
+ - {
get_param
: NovaDBPassword}
- '@127.0.0.1/nova'
neutron:
host:
- '@127.0.0.1/nova'
neutron:
host:
@@
-195,31
+187,31
@@
Resources:
Fn::Join:
- ''
- - 'mysql://neutron:'
Fn::Join:
- ''
- - 'mysql://neutron:'
- - {
Ref
: NeutronDBPassword}
+ - {
get_param
: NeutronDBPassword}
- '@127.0.0.1/ovs_neutron'
rabbit:
host:
'127.0.0.1'
username:
- '@127.0.0.1/ovs_neutron'
rabbit:
host:
'127.0.0.1'
username:
-
Ref
: RabbitUserName
+
get_param
: RabbitUserName
password:
password:
-
Ref
: RabbitPassword
+
get_param
: RabbitPassword
users:
username:
users:
username:
-
Ref
: RabbitUserName
+
get_param
: RabbitUserName
password:
password:
-
Ref
: RabbitPassword
+
get_param
: RabbitPassword
cookie:
cookie:
-
Fn::GetAtt
:
+
get_attr
:
- RabbitCookie
- value
service-password:
- RabbitCookie
- value
service-password:
-
Ref
: ServicePassword
-
P
roperties:
+
get_param
: ServicePassword
+
p
roperties:
ImageId:
ImageId:
-
Ref
: controllerImage
+
get_param
: controllerImage
InstanceType:
InstanceType:
-
Ref
: InstanceType
+
get_param
: InstanceType
KeyName:
KeyName:
-
Ref
: KeyName
-
T
ype: AWS::EC2::Instance
+
get_param
: KeyName
+
t
ype: AWS::EC2::Instance