Merge "Add heat.stack_domain_admin_password"
This commit is contained in:
commit
0490dd6658
|
@ -84,6 +84,11 @@ Parameters:
|
||||||
NoEcho: true
|
NoEcho: true
|
||||||
notcomputeImage:
|
notcomputeImage:
|
||||||
Type: String
|
Type: String
|
||||||
|
HeatStackDomainAdminPassword:
|
||||||
|
Description: Password for heat_domain_admin user.
|
||||||
|
Type: String
|
||||||
|
Default: ''
|
||||||
|
NoEcho: true
|
||||||
Resources:
|
Resources:
|
||||||
AccessPolicy:
|
AccessPolicy:
|
||||||
Properties:
|
Properties:
|
||||||
|
@ -163,6 +168,7 @@ Resources:
|
||||||
region:
|
region:
|
||||||
Ref: AWS::Region
|
Ref: AWS::Region
|
||||||
auth_encryption_key: unset
|
auth_encryption_key: unset
|
||||||
|
stack_domain_admin_password: {Ref: HeatStackDomainAdminPassword}
|
||||||
interfaces:
|
interfaces:
|
||||||
control:
|
control:
|
||||||
Ref: NovaInterfaces
|
Ref: NovaInterfaces
|
||||||
|
|
|
@ -140,6 +140,11 @@ Parameters:
|
||||||
Type: String
|
Type: String
|
||||||
Default: unset
|
Default: unset
|
||||||
Description: Salt for the rabbit cookie, change this to force the randomly generated rabbit cookie to change.
|
Description: Salt for the rabbit cookie, change this to force the randomly generated rabbit cookie to change.
|
||||||
|
HeatStackDomainAdminPassword:
|
||||||
|
Description: Password for heat_domain_admin user.
|
||||||
|
Type: String
|
||||||
|
Default: ''
|
||||||
|
NoEcho: true
|
||||||
Resources:
|
Resources:
|
||||||
RabbitCookie:
|
RabbitCookie:
|
||||||
Type: OS::Heat::RandomString
|
Type: OS::Heat::RandomString
|
||||||
|
@ -326,6 +331,7 @@ Resources:
|
||||||
admin_user: heat
|
admin_user: heat
|
||||||
auth_encryption_key: unset___________
|
auth_encryption_key: unset___________
|
||||||
db: mysql://heat:unset@localhost/heat
|
db: mysql://heat:unset@localhost/heat
|
||||||
|
stack_domain_admin_password: {Ref: HeatStackDomainAdminPassword}
|
||||||
watch_server_url:
|
watch_server_url:
|
||||||
Fn::Join:
|
Fn::Join:
|
||||||
- ''
|
- ''
|
||||||
|
|
|
@ -67,6 +67,11 @@ Parameters:
|
||||||
Type: String
|
Type: String
|
||||||
Default: unset
|
Default: unset
|
||||||
Description: Salt for the rabbit cookie, change this to force the randomly generated rabbit cookie to change.
|
Description: Salt for the rabbit cookie, change this to force the randomly generated rabbit cookie to change.
|
||||||
|
HeatStackDomainAdminPassword:
|
||||||
|
Description: Password for heat_domain_admin user.
|
||||||
|
Type: String
|
||||||
|
Default: ''
|
||||||
|
NoEcho: true
|
||||||
Resources:
|
Resources:
|
||||||
RabbitCookie:
|
RabbitCookie:
|
||||||
Type: OS::Heat::RandomString
|
Type: OS::Heat::RandomString
|
||||||
|
@ -142,6 +147,7 @@ Resources:
|
||||||
admin_user: heat
|
admin_user: heat
|
||||||
auth_encryption_key: unset___________
|
auth_encryption_key: unset___________
|
||||||
db: mysql://heat:unset@localhost/heat
|
db: mysql://heat:unset@localhost/heat
|
||||||
|
stack_domain_admin_password: {Ref: HeatStackDomainAdminPassword}
|
||||||
watch_server_url:
|
watch_server_url:
|
||||||
Fn::Join:
|
Fn::Join:
|
||||||
- ''
|
- ''
|
||||||
|
|
Loading…
Reference in New Issue