diff options
author | Brad P. Crochet <brad@redhat.com> | 2016-05-05 07:55:09 -0400 |
---|---|---|
committer | Brad P. Crochet <brad@redhat.com> | 2016-05-19 10:22:19 -0400 |
commit | d18f21853e2f3be7382a20d0f42232ff3a78b348 (patch) | |
tree | bf57f384c3e2a550812b0b1b9d455750fc1113f0 /overcloud.yaml | |
parent | be24147dc800bd42d7a5a3b8431ec91af0fac303 (diff) |
composable heat services
Adds new puppet and puppet pacemaker specific services for
Heat API, Heat API CFN, Heat API Cloudwatch, and Heat Engine.
The Pacemaker templates extend the default heat services and
swap in the pacemaker specific puppet-tripleo profile instead.
Change-Id: I387b6bfd763d2d86cad68a3119b0edd0caa237b0
Partially-implements: blueprint composable-services-within-roles
Depends-On: I194cbb6aa307c2331597147545cf10299cab132f
Depends-On: I14dc923ac8ee8d5d538e7f4cf8138ccee8805b53
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 cf20b512..a8798305 100644 --- a/overcloud.yaml +++ b/overcloud.yaml @@ -476,14 +476,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 @@ -667,6 +659,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 description: A list of service resources (configured in the Heat resource_registry) which represent nested stacks @@ -910,8 +906,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} |