diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2014-03-13 00:30:55 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2014-03-13 00:30:55 +0000 |
| commit | 0490dd665899d3265a72965aeaf3a342275f4328 (patch) | |
| tree | 74d4e6e8400a76cb873683d02b12ebfa13fadaf9 | |
| parent | 78eb968d15d593db40e6ff8270d9f1968625e364 (diff) | |
| parent | a7ea8ec32beb8e58bbcb6c5bd327bf718161b5a5 (diff) | |
Merge "Add heat.stack_domain_admin_password"
| -rw-r--r-- | notcompute.yaml | 6 | ||||
| -rw-r--r-- | overcloud-source.yaml | 6 | ||||
| -rw-r--r-- | undercloud-source.yaml | 6 |
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: - '' |