diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2016-05-26 12:26:54 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2016-05-26 12:26:54 +0000 |
| commit | e1d3c42ae970b615c7da138f5b18c8137cbc2f5d (patch) | |
| tree | 29148f0066124b7813caf4922256dc592a122cf5 /overcloud.yaml | |
| parent | c7d996765ba86d245fb2a4f0ade01142689aafb0 (diff) | |
| parent | d18f21853e2f3be7382a20d0f42232ff3a78b348 (diff) | |
Merge "composable heat services"
Diffstat (limited to 'overcloud.yaml')
| -rw-r--r-- | overcloud.yaml | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/overcloud.yaml b/overcloud.yaml index 147065ce..6a42730d 100644 --- a/overcloud.yaml +++ b/overcloud.yaml @@ -463,14 +463,6 @@ parameters: description: The password for the gnocchi service account. type: string hidden: true - HeatPassword: - description: The password for the Heat service account, used by the Heat services. - type: string - hidden: true - HeatStackDomainAdminPassword: - description: Password for heat_stack_domain_admin user. - type: string - hidden: true InstanceNameTemplate: default: 'instance-%08x' description: Template string to be used to generate instance names @@ -654,6 +646,10 @@ parameters: - OS::TripleO::Services::Keystone - OS::TripleO::Services::GlanceApi - OS::TripleO::Services::GlanceRegistry + - OS::TripleO::Services::HeatApi + - OS::TripleO::Services::HeatApiCfn + - OS::TripleO::Services::HeatApiCloudwatch + - OS::TripleO::Services::HeatEngine - OS::TripleO::Services::NeutronDhcpAgent - OS::TripleO::Services::NeutronL3Agent - OS::TripleO::Services::NeutronMetadataAgent @@ -902,8 +898,6 @@ resources: GnocchiBackend: {get_param: GnocchiBackend} GnocchiIndexerBackend: {get_param: GnocchiIndexerBackend} HAProxySyslogAddress: {get_param: HAProxySyslogAddress} - HeatPassword: {get_param: HeatPassword} - HeatStackDomainAdminPassword: {get_param: HeatStackDomainAdminPassword} HeatAuthEncryptionKey: {get_resource: HeatAuthEncryptionKey} HorizonAllowedHosts: {get_param: HorizonAllowedHosts} HorizonSecret: {get_resource: HorizonSecret} |