diff options
| author |   Zuul <zuul@review.openstack.org> | 2017-10-19 09:11:27 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2017-10-19 09:11:27 +0000 |
| commit | bbf25a19c808d2f6b0a5e1c4809c17d0c87fd827 (patch) | |
| tree | 8a03bfe4a5b55320a2b9b52a86af24aa909bf6c0 /overcloud-resource-registry-puppet.j2.yaml | |
| parent | f5cdf0a9fb6ea28c617e97a5060f2ecfc5b02729 (diff) | |
| parent | 5a1297b02bfe51dd7707dce39eaf40b78f80f28e (diff) | |
Merge "Remove Heat Cloudwatch API during upgrade and disable by default" into stable/pike
Diffstat (limited to 'overcloud-resource-registry-puppet.j2.yaml')
| -rw-r--r-- | overcloud-resource-registry-puppet.j2.yaml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/overcloud-resource-registry-puppet.j2.yaml b/overcloud-resource-registry-puppet.j2.yaml index e402f125..3ee77218 100644 --- a/overcloud-resource-registry-puppet.j2.yaml +++ b/overcloud-resource-registry-puppet.j2.yaml @@ -133,7 +133,7 @@ resource_registry: OS::TripleO::Services::GlanceRegistry: puppet/services/disabled/glance-registry-disabled.yaml OS::TripleO::Services::HeatApi: puppet/services/heat-api.yaml OS::TripleO::Services::HeatApiCfn: puppet/services/heat-api-cfn.yaml - OS::TripleO::Services::HeatApiCloudwatch: puppet/services/heat-api-cloudwatch.yaml + OS::TripleO::Services::HeatApiCloudwatch: puppet/services/disabled/heat-api-cloudwatch-disabled.yaml OS::TripleO::Services::HeatEngine: puppet/services/heat-engine.yaml OS::TripleO::Services::Kernel: puppet/services/kernel.yaml OS::TripleO::Services::MySQL: puppet/services/database/mysql.yaml |