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
Drop dnsmasq_range from the undercloud source.
[apex-tripleo-heat-templates.git]
/
notcompute.yaml
diff --git
a/notcompute.yaml
b/notcompute.yaml
index
3579760
..
5a4d9d2
100644
(file)
--- a/
notcompute.yaml
+++ b/
notcompute.yaml
@@
-1,4
+1,4
@@
-Description: Nova API,Keystone,Heat Engine and API,Glance,
Quantum
,Dedicated MySQL
+Description: Nova API,Keystone,Heat Engine and API,Glance,
Neutron
,Dedicated MySQL
server,Dedicated RabbitMQ Server
HeatTemplateFormatVersion: '2012-12-12'
Parameters:
server,Dedicated RabbitMQ Server
HeatTemplateFormatVersion: '2012-12-12'
Parameters:
@@
-8,6
+8,7
@@
Parameters:
Default: ''
Description: Password to use for mysqldump from Bootstrap Host
Type: String
Default: ''
Description: Password to use for mysqldump from Bootstrap Host
Type: String
+ NoEcho: true
BootstrapHost:
Default: ''
Description: Load mysqldump from this Host
BootstrapHost:
Default: ''
Description: Load mysqldump from this Host
@@
-16,10
+17,12
@@
Parameters:
Default: ''
Description: Root password for localhost access after bootstrap
Type: String
Default: ''
Description: Root password for localhost access after bootstrap
Type: String
+ NoEcho: true
BootstrapSlavePassword:
Default: ''
Description: Password to use with BootstrapSlaveUser
Type: String
BootstrapSlavePassword:
Default: ''
Description: Password to use with BootstrapSlaveUser
Type: String
+ NoEcho: true
BootstrapSlaveUser:
Default: ''
Description: User to use for replication from bootstrap host
BootstrapSlaveUser:
Default: ''
Description: User to use for replication from bootstrap host
@@
-27,9
+30,19
@@
Parameters:
GlanceDBPassword:
Description: Password for connecting to glance database
Type: String
GlanceDBPassword:
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
+ NoEcho: true
InstanceType:
Default: baremetal
Description: Use this flavor
InstanceType:
Default: baremetal
Description: Use this flavor
@@
-41,35
+54,48
@@
Parameters:
KeystoneDBPassword:
Description: Password for connecting to keystone
Type: String
KeystoneDBPassword:
Description: Password for connecting to keystone
Type: String
+ NoEcho: true
NovaDBPassword:
Description: Password for connecting to nova database
Type: String
NovaDBPassword:
Description: Password for connecting to nova database
Type: String
+ NoEcho: true
NovaInterfaces:
Default: eth0
Type: String
NovaInterfaces:
Default: eth0
Type: String
-
Quantum
DBPassword:
- Description: Password for connecting to
quantum
database
+
Neutron
DBPassword:
+ Description: Password for connecting to
neutron
database
Type: String
Type: String
- QuantumInterfaces:
+ NoEcho: true
+ NeutronInterfaces:
Default: eth0
Type: String
RabbitMQPassword:
Description: Password for RabbitMQ
Type: String
Default: eth0
Type: String
RabbitMQPassword:
Description: Password for RabbitMQ
Type: String
+ NoEcho: true
+ RabbitUserName:
+ Type: String
RabbitPassword:
Type: String
RabbitPassword:
Type: String
+ NoEcho: true
ServicePassword:
Description: admin_password for setting up auth in nova.
Type: String
ServicePassword:
Description: admin_password for setting up auth in nova.
Type: String
+ NoEcho: true
notcomputeImage:
Type: String
notcomputeImage:
Type: String
+ HeatStackDomainAdminPassword:
+ Description: Password for heat_domain_admin user.
+ Type: String
+ Default: ''
+ NoEcho: true
Resources:
AccessPolicy:
Properties:
AllowedResources:
Resources:
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
@@
-79,7
+105,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
@@
-107,9
+133,9
@@
Resources:
- database: nova
username: nova
password: {Ref: NovaDBPassword}
- database: nova
username: nova
password: {Ref: NovaDBPassword}
- - database:
quantum
- username:
quantum
- password: {Ref:
Quantum
DBPassword}
+ - database:
neutron
+ username:
neutron
+ password: {Ref:
Neutron
DBPassword}
glance:
db:
Fn::Join:
glance:
db:
Fn::Join:
@@
-117,6
+143,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:
@@
-125,12
+155,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:
@@
-138,12
+168,13
@@
Resources:
region:
Ref: AWS::Region
auth_encryption_key: unset
region:
Ref: AWS::Region
auth_encryption_key: unset
+ stack_domain_admin_password: {Ref: HeatStackDomainAdminPassword}
interfaces:
control:
Ref: NovaInterfaces
keystone:
host:
interfaces:
control:
Ref: NovaInterfaces
keystone:
host:
- Fn::GetAtt: [ notcompute, PrivateIp ]
+ '127.0.0.1'
db:
Fn::Join:
- ''
db:
Fn::Join:
- ''
@@
-157,24
+188,31
@@
Resources:
- - 'mysql://nova:'
- {Ref: NovaDBPassword}
- '@127.0.0.1/nova'
- - 'mysql://nova:'
- {Ref: NovaDBPassword}
- '@127.0.0.1/nova'
-
quantum
:
+
neutron
:
host:
host:
- Fn::GetAtt: [ notcompute , PrivateIp ]
+ '127.0.0.1'
ovs_db:
Fn::Join:
- ''
ovs_db:
Fn::Join:
- ''
- - - 'mysql://
quantum
:'
- - {Ref:
Quantum
DBPassword}
- - '@127.0.0.1/ovs_
quantum
'
+ - - 'mysql://
neutron
:'
+ - {Ref:
Neutron
DBPassword}
+ - '@127.0.0.1/ovs_
neutron
'
rabbit:
host:
rabbit:
host:
- Fn::GetAtt: [ notcompute , PrivateIp ]
+ '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: