aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorClint Byrum <clint@fewbar.com>2014-03-04 13:31:01 -0800
committerClint Byrum <clint@fewbar.com>2014-03-12 01:10:56 -0700
commita7ea8ec32beb8e58bbcb6c5bd327bf718161b5a5 (patch)
tree478d24889639e41c807daf6df3c7864f194924ee
parent6d2580f037b843fd7f663f02113b5d924f0bafb8 (diff)
Add heat.stack_domain_admin_password
This new parameter will be used to configure Heat for the new required stack domain admin. Change-Id: Ieace33154a14f472aab8ac76b2b876db77230110 Partial-Bug: #1287453
-rw-r--r--notcompute.yaml6
-rw-r--r--overcloud-source.yaml6
-rw-r--r--undercloud-source.yaml6
3 files changed, 18 insertions, 0 deletions
diff --git a/notcompute.yaml b/notcompute.yaml
index 2ad5b30b..5a4d9d21 100644
--- a/notcompute.yaml
+++ b/notcompute.yaml
@@ -84,6 +84,11 @@ Parameters:
NoEcho: true
notcomputeImage:
Type: String
+ HeatStackDomainAdminPassword:
+ Description: Password for heat_domain_admin user.
+ Type: String
+ Default: ''
+ NoEcho: true
Resources:
AccessPolicy:
Properties:
@@ -163,6 +168,7 @@ Resources:
region:
Ref: AWS::Region
auth_encryption_key: unset
+ stack_domain_admin_password: {Ref: HeatStackDomainAdminPassword}
interfaces:
control:
Ref: NovaInterfaces
diff --git a/overcloud-source.yaml b/overcloud-source.yaml
index 42fc07a6..90543bbe 100644
--- a/overcloud-source.yaml
+++ b/overcloud-source.yaml
@@ -140,6 +140,11 @@ Parameters:
Type: String
Default: unset
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:
RabbitCookie:
Type: OS::Heat::RandomString
@@ -326,6 +331,7 @@ Resources:
admin_user: heat
auth_encryption_key: unset___________
db: mysql://heat:unset@localhost/heat
+ stack_domain_admin_password: {Ref: HeatStackDomainAdminPassword}
watch_server_url:
Fn::Join:
- ''
diff --git a/undercloud-source.yaml b/undercloud-source.yaml
index 4fe2976c..f18612c8 100644
--- a/undercloud-source.yaml
+++ b/undercloud-source.yaml
@@ -67,6 +67,11 @@ Parameters:
Type: String
Default: unset
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:
RabbitCookie:
Type: OS::Heat::RandomString
@@ -142,6 +147,7 @@ Resources:
admin_user: heat
auth_encryption_key: unset___________
db: mysql://heat:unset@localhost/heat
+ stack_domain_admin_password: {Ref: HeatStackDomainAdminPassword}
watch_server_url:
Fn::Join:
- ''