Code Review
/
apex-tripleo-heat-templates.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Allow neutron_options customization for dashboard"
[apex-tripleo-heat-templates.git]
/
overcloud-resource-registry-puppet.yaml
diff --git
a/overcloud-resource-registry-puppet.yaml
b/overcloud-resource-registry-puppet.yaml
index
cb67c7e
..
1ef3660
100644
(file)
--- a/
overcloud-resource-registry-puppet.yaml
+++ b/
overcloud-resource-registry-puppet.yaml
@@
-124,6
+124,10
@@
resource_registry:
# services
OS::TripleO::Services: puppet/services/services.yaml
# services
OS::TripleO::Services: puppet/services/services.yaml
+ OS::TripleO::Services::CephMon: OS::Heat::None
+ OS::TripleO::Services::CephOSD: OS::Heat::None
+ OS::TripleO::Services::CephClient: OS::Heat::None
+ OS::TripleO::Services::CephExternal: OS::Heat::None
OS::TripleO::Services::CinderApi: puppet/services/cinder-api.yaml
OS::TripleO::Services::CinderScheduler: puppet/services/cinder-scheduler.yaml
OS::TripleO::Services::CinderVolume: puppet/services/cinder-volume.yaml
OS::TripleO::Services::CinderApi: puppet/services/cinder-api.yaml
OS::TripleO::Services::CinderScheduler: puppet/services/cinder-scheduler.yaml
OS::TripleO::Services::CinderVolume: puppet/services/cinder-volume.yaml