diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2017-07-12 07:39:07 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2017-07-12 07:39:07 +0000 |
| commit | f2b68a1d13a1b7357182cdbc07872f84dcade3c9 (patch) | |
| tree | 733075e6e1f3e8ab5066714913522c8104e8a296 /overcloud-resource-registry-puppet.j2.yaml | |
| parent | cdd6d4872e9fdad9d9390d062ec730854c8643a5 (diff) | |
| parent | 6d82c280361a0bef6246bf9f47caa35985431d1c (diff) | |
Merge "Remove ceilometer apache files on upgrade"
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 a579ee94..9cf5b680 100644 --- a/overcloud-resource-registry-puppet.j2.yaml +++ b/overcloud-resource-registry-puppet.j2.yaml @@ -192,7 +192,7 @@ resource_registry: OS::TripleO::Services::Snmp: puppet/services/snmp.yaml OS::TripleO::Services::Tacker: OS::Heat::None OS::TripleO::Services::Timezone: puppet/services/time/timezone.yaml - OS::TripleO::Services::CeilometerApi: puppet/services/ceilometer-api.yaml + OS::TripleO::Services::CeilometerApi: puppet/services/disabled/ceilometer-api-disabled.yaml OS::TripleO::Services::CeilometerCollector: puppet/services/disabled/ceilometer-collector-disabled.yaml OS::TripleO::Services::CeilometerExpirer: puppet/services/disabled/ceilometer-expirer-disabled.yaml OS::TripleO::Services::CeilometerAgentCentral: puppet/services/ceilometer-agent-central.yaml |